Commit d6cebe348cbd35cd5f7168a810e07c547a0312c1
1 parent
a908edac
Exists in
master
and in
4 other branches
use green bg for merged MR badge
Showing
2 changed files
with
6 additions
and
1 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -195,6 +195,11 @@ p.time { | @@ -195,6 +195,11 @@ p.time { | ||
| 195 | top: -5px; | 195 | top: -5px; |
| 196 | @include border-radius(4px); | 196 | @include border-radius(4px); |
| 197 | 197 | ||
| 198 | + &.success { | ||
| 199 | + background: #4A4; | ||
| 200 | + color: #FFF; | ||
| 201 | + } | ||
| 202 | + | ||
| 198 | &.error { | 203 | &.error { |
| 199 | background: #DA4E49; | 204 | background: #DA4E49; |
| 200 | color: #FFF; | 205 | color: #FFF; |
app/views/merge_requests/show/_mr_box.html.haml
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | %h4.box-title | 3 | %h4.box-title |
| 4 | = gfm escape_once(@merge_request.title) | 4 | = gfm escape_once(@merge_request.title) |
| 5 | - if @merge_request.merged? | 5 | - if @merge_request.merged? |
| 6 | - .error.status_info | 6 | + .success.status_info |
| 7 | %i.icon-ok | 7 | %i.icon-ok |
| 8 | Merged | 8 | Merged |
| 9 | - elsif @merge_request.closed? | 9 | - elsif @merge_request.closed? |