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

Merge branch 'merge-conflicts-icon-color' into 'master'
edba48c6 · Jacob Schatz · 787b73f5 · 028592eb · edba48c6 · edba48c6
Commit edba48c6 authored Jun 09, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

merge_requests.scss app/assets/stylesheets/pages/merge_requests.scss +5 -0

_conflicts.html.haml .../projects/merge_requests/widget/open/_conflicts.html.haml +2 -2

No files found.
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -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 {

--- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
-%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