From 9d71605ba53ba365e4b60880d4bd5dda7a40d22d Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz@gitlab.com>
Date: Fri, 19 Aug 2016 15:16:34 +0000
Subject: Merge branch 'pipelines-ui-updates' into 'master'

Pipelines ui updates

* Fixes hover color width on build list
* Fixes alignment of status icon on commits page
* Add play icon SVG

Small UI bugs with recent MRs

![Screen_Shot_2016-08-17_at_5.54.32_PM](/uploads/a5f1a38eac332865b17d8d74eeaa5142/Screen_Shot_2016-08-17_at_5.54.32_PM.png)
![Screen_Shot_2016-08-17_at_5.56.43_PM](/uploads/90608eee3e83dbe14244ff2be5a8867e/Screen_Shot_2016-08-17_at_5.56.43_PM.png)
![Screen_Shot_2016-08-18_at_9.18.37_AM](/uploads/9c1265fc3efa7b6084e2368d3fe458cd/Screen_Shot_2016-08-18_at_9.18.37_AM.png)

See merge request !5856
---
 app/assets/stylesheets/pages/builds.scss    |  5 ++++-
 app/assets/stylesheets/pages/commit.scss    |  9 +++++++++
 app/assets/stylesheets/pages/pipelines.scss | 15 +++++++++++----
 app/helpers/ci_status_helper.rb             |  2 +-
 app/views/shared/icons/_icon_play.svg       |  1 +
 5 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 app/views/shared/icons/_icon_play.svg

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 81fce55853c..c1bb250b42d 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -168,7 +168,6 @@
       text-overflow: ellipsis;
 
       &:hover {
-        background-color: $row-hover;
         color: $gl-text-color;
       }
     }
@@ -190,6 +189,10 @@
           display: block;
         }
       }
+
+      &:hover {
+        background-color: $row-hover;
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index bbe0c6c5f1f..53ec0002afe 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -66,6 +66,15 @@
       margin-left: 8px;
     }
   }
+
+  .ci-status-link {
+
+    svg {
+      position: relative;
+      top: 2px;
+      margin: 0 2px 0 3px;
+    }
+  }
 }
 
 .ci-status-link {
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ce1c424624f..6fa097e3bf1 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -300,6 +300,17 @@
 
     &.playable {
       background-color: $gray-light;
+
+      svg {
+        height: 12px;
+        width: 12px;
+        position: relative;
+        top: 1px;
+
+        path {
+          fill: $layout-link-gray;
+        }
+      }
     }
 
     .build-content {
@@ -319,10 +330,6 @@
       margin-right: 5px;
     }
 
-    .fa {
-      font-size: 13px;
-    }
-
     // Connect first build in each stage with right horizontal line
     &:first-child {
       &::after {
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index 94df7d131ca..bb285a17baf 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -39,7 +39,7 @@ module CiStatusHelper
       when 'running'
         'icon_status_running'
       when 'play'
-        return icon('play fw')
+        'icon_play'
       when 'created'
         'icon_status_pending'
       else
diff --git a/app/views/shared/icons/_icon_play.svg b/app/views/shared/icons/_icon_play.svg
new file mode 100644
index 00000000000..80a6d41dbf6
--- /dev/null
+++ b/app/views/shared/icons/_icon_play.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 11"><path fill-rule="evenodd" d="m9.283 6.47l-7.564 4.254c-.949.534-1.719.266-1.719-.576v-9.292c0-.852.756-1.117 1.719-.576l7.564 4.254c.949.534.963 1.392 0 1.934"/></svg>
\ No newline at end of file
-- 
cgit v1.2.3