diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-19 21:57:30 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-19 21:57:30 +0300 |
| commit | d6cebe348cbd35cd5f7168a810e07c547a0312c1 (patch) | |
| tree | 5866adcbe155e9298f4727eba7eb5ec324c2298e | |
| parent | a908edacacb4d6465b3d4cf4b99f3ecaf08eb8be (diff) | |
| download | gitlab-ce-d6cebe348cbd35cd5f7168a810e07c547a0312c1.tar.gz | |
use green bg for merged MR badge
| -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? |