diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-16 20:42:42 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-16 20:42:42 +0300 |
| commit | 9afc930b999048594e3f5a6a22097adcf2da50fe (patch) | |
| tree | 8ae0e397334e3755ac511470770f64821f0fe2ab /app/views/projects/merge_requests/show | |
| parent | 6404d6978075e272f1c83078eeda39d4a68d09c1 (diff) | |
| download | gitlab-ce-9afc930b999048594e3f5a6a22097adcf2da50fe.tar.gz | |
Make ui-box-show more visible. Refactor some css classes
Diffstat (limited to 'app/views/projects/merge_requests/show')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 1f750e22c65..93ae602a696 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -3,11 +3,12 @@ %h4.box-title = gfm escape_once(@merge_request.title) - if @merge_request.merged? - .success.status_info + .state-label.state-label-green %i.icon-ok Merged - elsif @merge_request.closed? - .error.status_info Closed + .state-label.state-label-red + Closed .ui-box-body %div @@ -32,7 +33,7 @@ %span %i.icon-remove Closed by #{link_to_member(@project, @merge_request.closed_event.author)} - %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. + %span #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. - if @merge_request.merged? .ui-box-bottom.alert-success %span |