From 4511bc1f3d7b28a01a0d35d69eea14b80f6bf91f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 19 Feb 2015 15:56:23 -0800
Subject: [PATCH] Prettify milestones page

---
 app/views/projects/merge_requests/index.html.haml | 14 +++++---------
 app/views/projects/milestones/index.html.haml     | 13 +++++--------
 app/views/shared/_milestones_filter.html.haml     |  2 +-
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index e4ee583c798..35e85156951 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -1,14 +1,10 @@
-%h3.page-title
-  Merge Requests
-  .pull-right
-    - if can? current_user, :write_merge_request, @project
-      = link_to new_project_merge_request_path(@project), class: "btn btn-new pull-left", title: "New Merge Request" do
-        %i.fa.fa-plus
-        New Merge Request
-
-%hr
 .merge-requests-holder
   .append-bottom-10
+    .pull-right
+      - if can? current_user, :write_merge_request, @project
+        = link_to new_project_merge_request_path(@project), class: "btn btn-new pull-left", title: "New Merge Request" do
+          %i.fa.fa-plus
+          New Merge Request
     = render 'shared/issuable_filter'
   .panel.panel-default
     %ul.well-list.mr-list
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index 7bad9c98548..6060f1bf860 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -1,11 +1,8 @@
-.milestones_content
-  %h3.page-title
-    Milestones
-    - if can? current_user, :admin_milestone, @project
-      = link_to new_project_milestone_path(@project), class: "pull-right btn btn-new", title: "New Milestone" do
-        %i.fa.fa-plus
-        New Milestone
-
+.pull-right
+  - if can? current_user, :admin_milestone, @project
+    = link_to new_project_milestone_path(@project), class: "pull-right btn btn-new", title: "New Milestone" do
+      %i.fa.fa-plus
+      New Milestone
 = render 'shared/milestones_filter'
 
 .milestones
diff --git a/app/views/shared/_milestones_filter.html.haml b/app/views/shared/_milestones_filter.html.haml
index 208f1b77372..f685ae7726c 100644
--- a/app/views/shared/_milestones_filter.html.haml
+++ b/app/views/shared/_milestones_filter.html.haml
@@ -1,5 +1,5 @@
 .milestones-filters.append-bottom-10
-  %ul.nav.nav-pills.nav-compact
+  %ul.nav.nav-tabs
     %li{class: ("active" if params[:state].blank? || params[:state] == 'opened')}
       = link_to milestones_filter_path(state: 'opened') do
         %i.fa.fa-exclamation-circle