From e1e71f1b1beea9809571c97a165cc4520407258f Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Wed, 17 May 2017 19:41:48 +0100
Subject: Add appropriate margin to deploy icon and rename error icon

---
 .../vue_merge_request_widget/components/mr_widget_deployment.js    | 2 +-
 .../vue_merge_request_widget/components/mr_widget_pipeline.js      | 2 +-
 app/assets/stylesheets/pages/merge_requests.scss                   | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
index 8b59e018836..f478e5f1e3c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
@@ -54,7 +54,7 @@ export default {
     <div class="mr-widget-heading">
       <div v-for="deployment in mr.deployments">
         <div class="ci-widget">
-          <div class="ci-status-icon ci-status-icon-success">
+          <div class="ci-status-icon ci-deploy-icon ci-status-icon-success">
             <span class="js-icon-link icon-link">
               <span
                 v-html="svg"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
index c02e10128e2..a6e8f3553e2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
@@ -31,7 +31,7 @@ export default {
     <div class="mr-widget-heading">
       <div class="ci-widget">
         <template v-if="hasCIError">
-          <div class="ci-status-icon ci-status-icon-failed ci-error js-ci-error">
+          <div class="ci-status-icon ci-status-icon-failed ci-error-icon js-ci-error">
             <span class="js-icon-link icon-link">
               <span
                 v-html="svg"
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index e5adca658ba..8d16dae165e 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -110,7 +110,12 @@
       margin-right: 8px;
     }
 
-    .ci-error {
+    .ci-error-icon {
+      margin-right: $btn-side-margin;
+    }
+
+    .ci-deploy-icon {
+      margin-left: 4px;
       margin-right: $btn-side-margin;
     }
   }
-- 
cgit v1.2.1