Remove repeating titles on members and label pages

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

3 files changed, 29 insertions, 30 deletions

diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss
index 48d9f890f62..1bd016e0df2 100644
--- a/app/assets/stylesheets/generic/blocks.scss
+++ b/app/assets/stylesheets/generic/blocks.scss
@@ -51,6 +51,6 @@
   }
 
   .oneline {
-    line-height: 44px;
+    line-height: 42px;
   }
 }
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index d44fe486212..284adb40e97 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -1,14 +1,15 @@
 - page_title "Labels"
-- if can? current_user, :admin_label, @project
-  = link_to new_namespace_project_label_path(@project.namespace, @project), class: "pull-right btn btn-new" do
-    New label
-%h3.page-title
-  Labels
-%hr
+
+.gray-content-block.top-block
+  - if can? current_user, :admin_label, @project
+    = link_to new_namespace_project_label_path(@project.namespace, @project), class: "pull-right btn btn-new" do
+      New label
+  .oneline
+    Labels can be applied to issues and merge requests.
 
 .labels
   - if @labels.present?
-    %ul.bordered-list.manage-labels-list
+    %ul.content-list.manage-labels-list
       = render @labels
     = paginate @labels, theme: 'gitlab'
   - else
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index 162583e4b1d..a40d1513671 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -1,30 +1,28 @@
 - page_title "Members"
-%h3.page-title
-  Users with access to this project
 
-%p.light
+.gray-content-block.top-block
+  .clearfix.js-toggle-container
+    = form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form'  do
+      .form-group
+        = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control search-text-input' }
+      = button_tag 'Search', class: 'btn'
+
+    - if can?(current_user, :admin_project_member, @project)
+      %span.pull-right
+        = button_tag class: 'btn btn-new btn-grouped js-toggle-button', type: 'button' do
+          Add members
+          %i.fa.fa-chevron-down
+        = link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
+          Import members
+
+      .js-toggle-content.hide.new-group-member-holder
+        = render "new_project_member"
+
+%p.prepend-top-default.light
+  Users with access to this project are listed below.
   Read more about project permissions
   %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
 
-%hr
-
-.clearfix.js-toggle-container
-  = form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form'  do
-    .form-group
-      = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control search-text-input' }
-    = button_tag 'Search', class: 'btn'
-
-  - if can?(current_user, :admin_project_member, @project)
-    %span.pull-right
-      = button_tag class: 'btn btn-new btn-grouped js-toggle-button', type: 'button' do
-        Add members
-        %i.fa.fa-chevron-down
-      = link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
-        Import members
-
-    .js-toggle-content.hide.new-group-member-holder
-      = render "new_project_member"
-
 = render "team", members: @project_members
 
 - if @group