use green bg for merged MR badge

d6cebe34 · Dmitriy Zaporozhets · a908edac · d6cebe34 · d6cebe34
Commit d6cebe34 authored Apr 19, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

app/assets/stylesheets/common.scss app/assets/stylesheets/common.scss +5 -0

app/views/merge_requests/show/_mr_box.html.haml app/views/merge_requests/show/_mr_box.html.haml +1 -1

No files found.
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -195,6 +195,11 @@ p.time {
  top: -5px;
  @include border-radius(4px);

+  &.success {
+    background: #4A4;
+    color: #FFF;
+  }
+
  &.error {
    background: #DA4E49;
    color: #FFF;

--- a/app/views/merge_requests/show/_mr_box.html.haml
+++ b/app/views/merge_requests/show/_mr_box.html.haml
@@ -3,7 +3,7 @@
    %h4.box-title
      = gfm escape_once(@merge_request.title)
      - if @merge_request.merged?
-        .error.status_info
+        .success.status_info
          %i.icon-ok
          Merged
      - elsif @merge_request.closed?