From d119cc5eacab29fc4a28fe423dcc8ea46b1f4952 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Thu, 25 Jun 2015 12:33:25 +0200
Subject: [PATCH] make profile nav and headlines uniform to admin nav and
 headlines

---
 .../javascripts/app/views/profile/language.jst.eco | 14 ++++++++------
 .../app/views/profile/linked_accounts.jst.eco      |  6 +++++-
 .../app/views/profile/notification.jst.eco         |  4 +++-
 .../javascripts/app/views/profile/password.jst.eco |  6 +++++-
 app/assets/stylesheets/zammad.css.scss             | 13 +++++++++----
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/app/views/profile/language.jst.eco b/app/assets/javascripts/app/views/profile/language.jst.eco
index 99c47760d..49e2d3379 100644
--- a/app/assets/javascripts/app/views/profile/language.jst.eco
+++ b/app/assets/javascripts/app/views/profile/language.jst.eco
@@ -1,8 +1,10 @@
-<form class="form-normal">
-  <h2><%- @T( 'Language' ) %></h2>
-  <p><%- @T( 'Change your language.' ) %></p>
-  <div class="settings-entry horizontal end">
-    <div class="form-item language_item flex"></div>
-    <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
+<div class="page-header">
+  <div class="page-header-title">
+    <h1><%- @T( 'Language' ) %></h1>
   </div>
+</div>
+<p><%- @T( 'Change your language.' ) %></p>
+<form class="settings-entry horizontal end">
+  <div class="form-item language_item flex"></div>
+  <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
 </form>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/profile/linked_accounts.jst.eco b/app/assets/javascripts/app/views/profile/linked_accounts.jst.eco
index e91349cbf..c99c070ae 100644
--- a/app/assets/javascripts/app/views/profile/linked_accounts.jst.eco
+++ b/app/assets/javascripts/app/views/profile/linked_accounts.jst.eco
@@ -1,4 +1,8 @@
-<h2><%- @T( 'Link Accounts' ) %></h2>
+<div class="page-header">
+  <div class="page-header-title">
+    <h1><%- @T( 'Link Accounts' ) %></h1>
+  </div>
+</div>
 <ul>
   <% for auth_provider in @auth_providers: %>
     <li><%- @T( auth_provider.name ) %> <% if !@user['accounts'] || !@user['accounts'][auth_provider.key]: %><a href="<%= auth_provider.url %>"><%- @T('Add') %></a><% else: %>"<%= @user['accounts'][auth_provider.key]['username'] %>" <a href="#" data-uid="<%= @user['accounts'][auth_provider.key]['uid'] %>" data-provider="<%= auth_provider.key %>" data-type="remove"><%- @T('remove') %></a><% end %></li>
diff --git a/app/assets/javascripts/app/views/profile/notification.jst.eco b/app/assets/javascripts/app/views/profile/notification.jst.eco
index 1a8ea2826..4e55fed73 100644
--- a/app/assets/javascripts/app/views/profile/notification.jst.eco
+++ b/app/assets/javascripts/app/views/profile/notification.jst.eco
@@ -1,4 +1,6 @@
-<h2><%- @T( 'Notifications' ) %></h2>
+<div class="page-header">
+  <div class="page-header-title"><h1><%- @T( 'Notifications' ) %></h1></div>
+</div>
 
 <form>
 
diff --git a/app/assets/javascripts/app/views/profile/password.jst.eco b/app/assets/javascripts/app/views/profile/password.jst.eco
index 8045ca0f7..9311531dd 100644
--- a/app/assets/javascripts/app/views/profile/password.jst.eco
+++ b/app/assets/javascripts/app/views/profile/password.jst.eco
@@ -1,4 +1,8 @@
-<h2><%- @T( 'Change your password' ) %></h2>
+<div class="page-header">
+  <div class="page-header-title">
+    <h1><%- @T( 'Change your password' ) %></h1>
+  </div>
+</div>
 <form class="settings-entry">
   <div class="password_item"></div>
   <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 8f29e51d5..842cdd91c 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -2320,14 +2320,19 @@ footer {
     border-left: 1px solid #e6e6e6;
   }
 
-.NavBarAdmin.sidebar {
-  padding-top: 1px;
+.NavBarAdmin.sidebar,
+.NavBarProfile.sidebar, {
   width: $sidebarWidth;
-}
-  .NavBarAdmin h2 {
+
+  h2 {
     margin: 21px 0 12px;
   }
 
+  h2:first-child {
+    margin-top: 0;
+  }
+}
+
   .nav-stacked > li + li {
     margin-top: 0;
   }