diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 17:59:20 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 17:59:20 +0300 |
| commit | 028592eba6485e574fb0fb42937519b9e8ace37d (patch) | |
| tree | ab606638d7adfc792bbba33212f3375f8e4b53bd | |
| parent | 316630ad2c7f654024d7ea10cd5c2f978f37357e (diff) | |
| download | gitlab-ce-merge-conflicts-icon-color.tar.gz | |
Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-color
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 8046e203a99..9ddb216d944 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -105,6 +105,11 @@ font-size: 17px; margin: 5px 0; color: $gl-gray-dark; + + &.has-conflicts .fa-exclamation-triangle { + color: $gl-warning; + } + } p:last-child { diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index e6c089fefb2..06ab0a3fa00 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -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 |