Skip to content

G
gitlab-ce
Commit 028592eb authored by Fatih Acet's avatar Fatih Acet
Browse files
Options

Use warning color merge conflicts icon in MR status widget.

parent 316630ad
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
app/assets/stylesheets/pages/merge_requests.scss
View file @ 028592eb
...@@ -105,6 +105,11 @@ ...@@ -105,6 +105,11 @@
font-size: 17px; font-size: 17px;
margin: 5px 0; margin: 5px 0;
color: $gl-gray-dark; color: $gl-gray-dark;
&.has-conflicts .fa-exclamation-triangle {
color: $gl-warning;
}
} }
p:last-child { p:last-child {
......
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
View file @ 028592eb
%h4 %h4.has-conflicts
= icon("exclamation-triangle") = icon("exclamation-triangle")
This merge request contains merge conflicts This merge request contains merge conflicts
......
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