From 9cb3fcda281853f5bdbb4c3a716a875ce72928e4 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Tue, 9 Aug 2016 11:58:42 -0500
Subject: [PATCH] Fix spacing and vertical alignment on build status icon on
 commits page

---
 CHANGELOG                                     |  1 +
 app/assets/stylesheets/pages/commit.scss      | 20 +++++++++++++++++++
 .../projects/commit/_commit_box.html.haml     |  3 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 77bcea54cf9..62b8c9e0ac1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,7 @@ v 8.11.0 (unreleased)
   - Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
   - Fix search for notes which belongs to deleted objects
   - Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
+  - Fix spacing and vertical alignment on build status icon on commits page (ClemMakesApps)
   - Allow branch names ending with .json for graph and network page !5579 (winniehell)
   - Add the `sprockets-es6` gem
   - Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index bbe0c6c5f1f..fe8a8025038 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -66,6 +66,26 @@
       margin-left: 8px;
     }
   }
+
+  .ci-status-link {
+    margin-left: 2px;
+
+    svg {
+      vertical-align: middle;
+    }
+
+    .ci-status-label {
+      display: inline-block;
+    }
+
+    &:hover {
+      text-decoration: none;
+
+      .ci-status-label {
+        text-decoration: underline;
+      }
+    }
+  }
 }
 
 .ci-status-link {
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 3ad866bb2f1..14adee7a6e9 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -56,7 +56,8 @@
     = pluralize(@commit.pipelines.count, 'pipeline')
     = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status-link ci-status-icon-#{@commit.status}" do
       = ci_icon_for_status(@commit.status)
-      = ci_label_for_status(@commit.status)
+      %span.ci-status-label
+        = ci_label_for_status(@commit.status)
     - if @commit.pipelines.duration
       in
       = time_interval_in_words @commit.pipelines.duration