Apply new style for issues, merge requests and milestone pages

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

10 files changed, 35 insertions, 53 deletions

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 8dccfcbee09..096698e8466 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -398,5 +398,12 @@ table {
       color: #4c4e54;
       border-bottom: 2px solid #1cacfc;
     }
+
+    .badge {
+      font-weight: normal;
+      background-color: #fff;
+      background-color: #eee;
+      color: #78a;
+    }
   }
 }
diff --git a/app/assets/stylesheets/generic/filters.scss b/app/assets/stylesheets/generic/filters.scss
index bd93a79722d..8e6922c9231 100644
--- a/app/assets/stylesheets/generic/filters.scss
+++ b/app/assets/stylesheets/generic/filters.scss
@@ -2,31 +2,6 @@
   margin-right: 15px;
 }
 
-.issues-state-filters {
-  li.active a {
-    border-color: #DDD !important;
-
-    &, &:hover, &:active, &.active {
-      background: #f5f5f5 !important;
-      border-bottom: 1px solid #f5f5f5 !important;
-    }
-  }
-}
-
-.issues-details-filters {
-  font-size: 13px;
-  background: #f5f5f5;
-  margin: -10px 0;
-  padding: 10px 15px;
-  margin-top: -15px;
-  border-left: 1px solid #DDD;
-  border-right: 1px solid #DDD;
-
-  .btn {
-    font-size: 13px;
-  }
-}
-
 @media (min-width: 800px)  {
   .issues-filters,
   .issues_bulk_update {
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 586e7b5f8da..2d32d82e107 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -45,3 +45,14 @@
 
   .btn { font-size: 13px; }
 }
+
+.project-issuable-filter {
+  .controls {
+    float: right;
+    margin-top: 7px;
+  }
+
+  .center-top-menu {
+    text-align: left;
+  }
+}
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 14734ae7372..09e70f9ae2c 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -4,8 +4,6 @@
   - if current_user
     = auto_discovery_link_tag(:atom, issues_dashboard_url(format: :atom, private_token: current_user.private_token), title: "#{current_user.name} issues")
 
-%p.light
-  List all issues from all projects you have access to.
 
 .append-bottom-20
   .pull-right
@@ -15,4 +13,5 @@
           %i.fa.fa-rss
 
   = render 'shared/issuable/filter', type: :issues
+
 = render 'shared/issues'
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 3739a7d5dbc..d1f332fa0d3 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -1,9 +1,6 @@
 - page_title "Merge Requests"
 - header_title  "Merge Requests", merge_requests_dashboard_path(assignee_id: current_user.id)
 
-%p.light
-  List all merge requests from all projects you have access to.
-
 .append-bottom-20
   = render 'shared/issuable/filter', type: :merge_requests
 = render 'shared/merge_requests'
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index 5d243adb5fe..a3399c57aa2 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -1,9 +1,8 @@
-.panel.panel-default
-  %ul.well-list.issues-list
-    = render @issues
-    - if @issues.blank?
-      %li
-        .nothing-here-block No issues to show
+%ul.content-list.issues-list
+  = render @issues
+  - if @issues.blank?
+    %li
+      .nothing-here-block No issues to show
 
 - if @issues.present?
   .pull-right
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index d06225f5488..24314d11404 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -3,8 +3,8 @@
   - if current_user
     = auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
 
-.append-bottom-10
-  .pull-right
+.project-issuable-filter
+  .controls
     .pull-left
       - if current_user
         .hidden-xs.pull-left
diff --git a/app/views/projects/merge_requests/_merge_requests.html.haml b/app/views/projects/merge_requests/_merge_requests.html.haml
index b8a0ca9a42f..d86707b3d97 100644
--- a/app/views/projects/merge_requests/_merge_requests.html.haml
+++ b/app/views/projects/merge_requests/_merge_requests.html.haml
@@ -1,9 +1,8 @@
-.panel.panel-default
-  %ul.well-list.mr-list
-    = render @merge_requests
-    - if @merge_requests.blank?
-      %li
-        .nothing-here-block No merge requests to show
+%ul.content-list.mr-list
+  = render @merge_requests
+  - if @merge_requests.blank?
+    %li
+      .nothing-here-block No merge requests to show
 
 - if @merge_requests.present?
   .pull-right
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index 72fbe2e27a7..d3a576977c2 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -1,7 +1,7 @@
 - page_title "Merge Requests"
 = render 'projects/last_push'
-.append-bottom-10
-  .pull-right
+.project-issuable-filter
+  .controls
     = render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
 
     - if can? current_user, :create_merge_request, @project
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index bcaa48c7a12..8f16773077e 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -1,33 +1,28 @@
 .issues-filters
   .issues-state-filters
-    %ul.nav.nav-tabs
+    %ul.center-top-menu
       %li{class: ("active" if params[:state] == 'opened')}
         = link_to page_filter_path(state: 'opened') do
-          = icon('exclamation-circle')
           #{state_filters_text_for(:opened, @project)}
 
       - if defined?(type) && type == :merge_requests
         %li{class: ("active" if params[:state] == 'merged')}
           = link_to page_filter_path(state: 'merged') do
-            = icon('check-circle')
             #{state_filters_text_for(:merged, @project)}
 
         %li{class: ("active" if params[:state] == 'closed')}
           = link_to page_filter_path(state: 'closed') do
-            = icon('ban')
             #{state_filters_text_for(:closed, @project)}
       - else
         %li{class: ("active" if params[:state] == 'closed')}
           = link_to page_filter_path(state: 'closed') do
-            = icon('check-circle')
             #{state_filters_text_for(:closed, @project)}
 
       %li{class: ("active" if params[:state] == 'all')}
         = link_to page_filter_path(state: 'all') do
-          = icon('compass')
           #{state_filters_text_for(:all, @project)}
 
-  .issues-details-filters
+  .issues-details-filters.gray-content-block
     = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name]), method: :get, class: 'filter-form' do
       - if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
         .check-all-holder