MR: merged badge. Removed colors from MR list

10 files changed, 28 insertions, 25 deletions

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index ec5faff343c..6cd71ac6308 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -694,8 +694,8 @@ li.note {
     }
   }
   &.merged { 
-    background: #FEF;
-    border-color:#EDE;
+    background: #F5f5f5;
+    border-color:#E5E5E5;
     .icon { 
       background: #DAD;
       border:1px solid #B8B;
diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index 091003e407e..a347eeb2fc5 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -174,6 +174,9 @@ a:focus {
 
 .label { 
   background-color: #474D57;
+  &.label-important { 
+    background-color: #B94A48;
+  }
 }
 
 .nav-tabs > li > a, .nav-pills > li > a {
diff --git a/app/assets/stylesheets/nav.scss b/app/assets/stylesheets/nav.scss
index 9403539b888..86a7c26e0f7 100644
--- a/app/assets/stylesheets/nav.scss
+++ b/app/assets/stylesheets/nav.scss
@@ -8,7 +8,7 @@ nav.main_menu {
   margin:30px 0;
   background:#eee;
   border:1px solid #bbb;
-  height:38px;
+  height:36px;
   background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
   background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
   background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
@@ -55,7 +55,7 @@ nav.main_menu {
       border-bottom-left-radius: 4px;
       border-left: 0;
     }
-    padding: 10px 25px;
+    padding: 9px 25px;
     display: inline-block;
     color: $style_color;
     position: relative;
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 29e7c6f745f..f9bfc8cdcf6 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -36,7 +36,6 @@ module MergeRequestsHelper
     classes = "merge_request"
     classes << " closed" if mr.closed
     classes << " merged" if mr.merged?
-    classes << " today" if mr.today?
     classes
   end
 end
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index e7dc3f835b2..492cedf629b 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -19,6 +19,6 @@
     %strong= issue.assignee_name
     - if issue.upvotes > 0
       %span.badge.badge-success= "+#{issue.upvotes}"
-
+  
   = link_to project_issue_path(issue.project, issue) do
     %p.row_title= truncate(issue.title, :length => 100)
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index ade80dade8f..1c34ad25d80 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -17,16 +17,16 @@
 
   .issues_legend
     .list_legend
+      .icon.today
+      .text Today
+
+    .list_legend
       .icon.critical
       .text Critical
 
     .list_legend
       .icon.closed
       .text Closed
-
-    .list_legend
-      .icon.today
-      .text Today
   .clearfix
 
   %div#issues-table-holder.ui-box
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 4b94339d3e3..0d3c4e19097 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -1,5 +1,6 @@
 %h3
   Issue ##{@issue.id}
+
   %small
     created at
     = @issue.created_at.stamp("Aug 21, 2011")
@@ -48,6 +49,11 @@
         %strong
           = truncate(milestone.title, :length => 20)
 
+    .right
+      - if @issue.critical
+        %span.label.label-important
+          Critical
+
   - if @issue.description.present?
     .bottom_box_content
       = preserve do
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index e744a9617c8..794e927c2db 100644
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -1,8 +1,11 @@
 %li.wll{ :class => mr_css_classes(merge_request) }
-  .list_legend
-    .icon
   .right
     .left
+      - if merge_request.merged?
+        %span.btn.small.disabled.padded
+          %strong
+            %i.icon-ok
+            = "MERGED"
       - if merge_request.notes.any?
         %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
       %span.btn.small.disabled.padded
diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml
index d98e52b9346..7eed3b92f69 100644
--- a/app/views/merge_requests/index.html.haml
+++ b/app/views/merge_requests/index.html.haml
@@ -6,19 +6,6 @@
 
 %br
 
-.mrs_legend
-  .list_legend
-    .icon.today
-    .text Today
-
-  .list_legend
-    .icon.merged
-    .text Merged
-
-  .list_legend
-    .icon.closed
-    .text Closed
-.clearfix
 
 .ui-box
   .title
diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml
index 7707b79bb64..6f3456686b4 100644
--- a/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@@ -6,6 +6,11 @@
   %span.pretty_label.branch= @merge_request.target_branch
 
   %span.right
+    - if @merge_request.merged?
+      %span.btn.small.disabled.padded
+        %strong
+          %i.icon-ok
+          = "MERGED"
     - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.open?
         = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded danger", :title => "Close merge request"