From 8f4bea8bcc8146099620995b278fe8be31f8fd17 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 16 May 2017 12:18:49 +0000
Subject: Merge branch 'add-right-margin-to-ci-error-icon' into 'master'

Added ci-error class and applied a right margin to the ci error widget state

See merge request !11353
---
 .../vue_merge_request_widget/components/mr_widget_pipeline.js         | 2 +-
 app/assets/stylesheets/pages/merge_requests.scss                      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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 801b9fb1ba1..c622e8ba2f6 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
@@ -28,7 +28,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 js-ci-error">
+          <div class="ci-status-icon ci-status-icon-failed ci-error 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 97019b19667..89cf57ee215 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -113,6 +113,10 @@
       width: 22px;
       height: 22px;
     }
+
+    .ci-error {
+      margin-right: $btn-side-margin;
+    }
   }
 
   .mr-widget-body,
-- 
cgit v1.2.1