Skip to content

G
gitlab-ce
Commit d6cebe34 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

use green bg for merged MR badge

parent a908edac
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
app/assets/stylesheets/common.scss
View file @ d6cebe34
...@@ -195,6 +195,11 @@ p.time { ...@@ -195,6 +195,11 @@ p.time {
top: -5px; top: -5px;
@include border-radius(4px); @include border-radius(4px);
&.success {
background: #4A4;
color: #FFF;
}
&.error { &.error {
background: #DA4E49; background: #DA4E49;
color: #FFF; color: #FFF;
......
app/views/merge_requests/show/_mr_box.html.haml
View file @ d6cebe34
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%h4.box-title %h4.box-title
= gfm escape_once(@merge_request.title) = gfm escape_once(@merge_request.title)
- if @merge_request.merged? - if @merge_request.merged?
.error.status_info .success.status_info
%i.icon-ok %i.icon-ok
Merged Merged
- elsif @merge_request.closed? - elsif @merge_request.closed?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7