Merge branch 'merge-conflicts-icon-color' into 'master'
Use warning color merge conflicts icon in MR status widget. Fixes #18174 ### Before ![Screen_Shot_2016-06-06_at_18.00.56](/uploads/4a74b1710478daee5ee95b7c6b6a835f/Screen_Shot_2016-06-06_at_18.00.56.png) ### After ![Screen_Shot_2016-06-06_at_17.58.04](/uploads/28faefaebef30e4256390029c87b28bb/Screen_Shot_2016-06-06_at_17.58.04.png) See merge request !4487
This commit is contained in:
commit
edba48c6c4
2 changed files with 7 additions and 2 deletions
|
@ -108,6 +108,11 @@
|
|||
font-size: 17px;
|
||||
margin: 5px 0;
|
||||
color: $gl-gray-dark;
|
||||
|
||||
&.has-conflicts .fa-exclamation-triangle {
|
||||
color: $gl-warning;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
p:last-child {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
%h4
|
||||
%h4.has-conflicts
|
||||
= icon("exclamation-triangle")
|
||||
This merge request contains merge conflicts
|
||||
|
||||
%p
|
||||
Please resolve these conflicts or
|
||||
Please resolve these conflicts or
|
||||
- if @merge_request.can_be_merged_by?(current_user)
|
||||
#{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
|
||||
- else
|
||||
|
|
Loading…
Reference in a new issue