Set of small UI fixes to project and profile pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

9 files changed, 26 insertions, 34 deletions

diff --git a/app/views/profiles/applications.html.haml b/app/views/profiles/applications.html.haml
index 0436c2213da..86f35823406 100644
--- a/app/views/profiles/applications.html.haml
+++ b/app/views/profiles/applications.html.haml
@@ -1,7 +1,7 @@
 - page_title "Applications"
 - header_title page_title, applications_profile_path
 
-.gray-content-block.top-block
+.alert.alert-help.prepend-top-default
   - if user_oauth_applications?
     Manage applications that can use GitLab as an OAuth provider,
     and applications that you've authorized to use your account.
diff --git a/app/views/profiles/audit_log.html.haml b/app/views/profiles/audit_log.html.haml
index 8fdba45b193..8f45f41cfe3 100644
--- a/app/views/profiles/audit_log.html.haml
+++ b/app/views/profiles/audit_log.html.haml
@@ -1,7 +1,7 @@
 - page_title "Audit Log"
 - header_title page_title, audit_log_profile_path
 
-.gray-content-block.top-block
+.alert.alert-help.prepend-top-default
   History of authentications
 
 .prepend-top-default
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 1d140347a5f..705e1804717 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -1,24 +1,22 @@
 - page_title "Emails"
 - header_title page_title, profile_emails_path
 
-.gray-content-block.top-block
-  Control emails linked to your account
-
-%ul.prepend-top-default
-  %li
-    Your
-    %b Primary Email
-    will be used for avatar detection and web based operations, such as edits and merges.
-  %li
-    Your
-    %b Notification Email
-    will be used for account notifications.
-  %li
-    Your
-    %b Public Email
-    will be displayed on your public profile.
-  %li
-    All email addresses will be used to identify your commits.
+.alert.alert-help.prepend-top-default
+  %ul
+    %li
+      Your
+      %b Primary Email
+      will be used for avatar detection and web based operations, such as edits and merges.
+    %li
+      Your
+      %b Notification Email
+      will be used for account notifications.
+    %li
+      Your
+      %b Public Email
+      will be displayed on your public profile.
+    %li
+      All email addresses will be used to identify your commits.
 
 .panel.panel-default
   .panel-heading
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 17a4195030e..c9a6a93f545 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,14 +1,14 @@
 - page_title "SSH Keys"
 - header_title page_title, profile_keys_path
 
-.gray-content-block.top-block
-  .pull-right
+.top-area
+  .nav-text
+    Before you can add an SSH key you need to
+    = link_to "generate it.", help_page_path("ssh", "README")
+  .nav-controls
     = link_to new_profile_key_path, class: "btn btn-new" do
       = icon('plus')
       Add SSH Key
-  .oneline
-    Before you can add an SSH key you need to
-    = link_to "generate it.", help_page_path("ssh", "README")
 
 .prepend-top-default
 = render 'key_table'
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 0bcadc965fa..d5f61d9f0ca 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -1,9 +1,6 @@
 - page_title "Notifications"
 - header_title page_title, profile_notifications_path
 
-.gray-content-block.top-block
-  These are your global notification settings.
-
 .prepend-top-default
 = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications form-horizontal global-notifications-form' } do |f|
   -if @user.errors.any?
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index fab7c45c9b2..ab070c09beb 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -1,7 +1,7 @@
 - page_title "Password"
 - header_title page_title, edit_profile_password_path
 
-.gray-content-block.top-block
+.alert.alert-help.prepend-top-default
   - if @user.password_automatically_set?
     Set your password.
   - else
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 877589dc390..1a53b4393e4 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -1,8 +1,7 @@
 - page_title 'Preferences'
 - header_title page_title, profile_preferences_path
-- @blank_container = true
 
-.alert.alert-help
+.alert.alert-help.prepend-top-default
   These settings allow you to customize the appearance and behavior of the site.
   They are saved with your account and will persist to any device you use to
   access the site.
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index add9a00138b..5051c6bf83b 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,4 +1,4 @@
-.gray-content-block.top-block
+.alert.alert-help.prepend-top-default
   This information will appear on your profile.
   - if current_user.ldap_user?
     Some options are unavailable for LDAP accounts
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 8a99aceef7f..ea7d0092d4c 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -1,5 +1,3 @@
-- @blank_container = true
-
 .project-edit-container.prepend-top-default
   .project-edit-errors
   .project-edit-content