Merge branch 'pipeline-row-improvements' into 'master'

Pipeline row improvements

## What does this MR do?
Makes minor pipeline row improvements:
* Add margin between labels
* Remove underline hover style on status button
* Add margin between buttons if both retry and cancel are present

## What are the relevant issue numbers?
Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920

## Screenshots (if relevant)
![Screen_Shot_2016-07-14_at_12.31.54_PM](/uploads/ae88651cb240ea90a0be58ab0ed65805/Screen_Shot_2016-07-14_at_12.31.54_PM.png)

See merge request !5258

2 files changed, 25 insertions, 6 deletions

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index cbf8297f387..08da4e290dc 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -43,6 +43,13 @@
     border-top-width: 1px;
   }
 
+  .commit-link {
+
+    a:hover {
+      text-decoration: none;
+    }
+  }
+
   .branch-commit {
 
     .branch-name {
@@ -80,7 +87,12 @@
       margin-left: 0;
     }
 
+    .label {
+      margin-right: 4px;
+    }
+
     .label-container {
+      font-size: 0;
 
       .label {
         margin-top: 5px;
@@ -116,6 +128,12 @@
       color: $table-text-gray;
     }
 
+    .cancel-retry-btns {
+      .btn:not(:first-child) {
+        margin-left: 8px;
+      }
+    }
+
     .dropdown-toggle,
     .dropdown-menu {
       color: $table-text-gray;
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index 4ef72ff5d2a..b53a8633937 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -80,9 +80,10 @@
                     %span Download '#{build.name}' artifacts
 
       - if can?(current_user, :update_pipeline, @project)
-        - if pipeline.retryable?
-          = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn has-tooltip', title: "Retry", method: :post do
-            = icon("repeat")
-        - if pipeline.cancelable?
-          = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
-            = icon("remove")
+        .cancel-retry-btns
+          - if pipeline.retryable?
+            = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn has-tooltip', title: "Retry", method: :post do
+              = icon("repeat")
+          - if pipeline.cancelable?
+            = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
+              = icon("remove")