From 0912022d32fccfeeb40ddbb9efc7456ae149203b Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Thu, 8 Sep 2016 09:30:44 -0500
Subject: [PATCH] Add background color and icon to retried builds

---
 app/assets/stylesheets/framework/variables.scss | 1 +
 app/assets/stylesheets/pages/builds.scss        | 9 +++++++++
 app/assets/stylesheets/pages/pipelines.scss     | 4 ++++
 app/views/projects/builds/_sidebar.html.haml    | 4 ++--
 app/views/projects/ci/builds/_build.html.haml   | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 7690d65de8e..eafe84570a8 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -16,6 +16,7 @@ $white-light: #fff;
 $white-normal: #ededed;
 $white-dark: #ececec;
 
+$gray-lightest: #fdfdfd;
 $gray-light: #fafafa;
 $gray-lighter: #f9f9f9;
 $gray-normal: #f5f5f5;
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index a7b23a24e58..2793282c1cb 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -210,9 +210,18 @@
         }
       }
 
+      &.retried {
+        background-color: $gray-lightest;
+      }
+
       &:hover {
         background-color: $row-hover;
       }
+
+      .fa-refresh {
+        font-size: 13px;
+        margin-left: 3px;
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 7b71876b822..e40ce6d76b1 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -73,6 +73,10 @@
     border-top-width: 1px;
   }
 
+  .build.retried {
+    background-color: $gray-lightest;
+  }
+
   .commit-link {
 
     .ci-status {
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index 2c77d438048..687b93916b0 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -126,7 +126,7 @@
   .builds-container
     - statuses.each do |build_status|
       - builds.select{|build| build.status == build_status}.each do |build|
-        .build-job{class: ('active' if build == @build), data: {stage: build.stage}}
+        .build-job{class: ('active' if build == @build; 'retried' if @build.retried?), data: {stage: build.stage}}
           = link_to namespace_project_build_path(@project.namespace, @project, build) do
             = icon('arrow-right')
             = ci_icon_for_status(build.status)
@@ -136,4 +136,4 @@
               - else
                 = build.id
             - if @build.retried?
-              %i.fa.fa-warning.has-tooltip{data: { container: 'body', placement: 'bottom' }, title: 'This build was retried'}
+              %i.fa.fa-refresh.has-tooltip{data: { container: 'body', placement: 'bottom' }, title: 'This build was retried'}
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 9248adfde80..cc6f9472c8b 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -6,7 +6,7 @@
 - coverage = local_assigns.fetch(:coverage, false)
 - allow_retry = local_assigns.fetch(:allow_retry, false)
 
-%tr.build.commit
+%tr.build.commit{class: ('retried' if defined?(retried) && retried)}
   %td.status
     - if can?(current_user, :read_build, build)
       = ci_status_with_icon(build.status, namespace_project_build_url(build.project.namespace, build.project, build))