diff options
| -rw-r--r-- | app/assets/stylesheets/common.scss | 5 | ||||
| -rw-r--r-- | app/views/merge_requests/show/_mr_box.html.haml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c3cc601f16f..ccc6f7a9d2d 100644 --- 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; diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml index a9c7e993b05..594f4061c23 100644 --- 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? |