Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 8 deletions

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index ed4b6b7cdb7..3c2355eb87f 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -849,12 +849,6 @@ $perf-bar-bucket-box-shadow-to: rgba($black, 0.25);
 $perf-bar-canary-text: $orange-400;
 
 /*
-Issuable warning
-*/
-$issuable-warning-size: 24px;
-$issuable-warning-icon-margin: 4px;
-
-/*
 Image Commenting cursor
 */
 $image-comment-cursor-left-offset: 12;
diff --git a/app/assets/stylesheets/page_bundles/issuable.scss b/app/assets/stylesheets/page_bundles/issuable.scss
index 1b5da0368c6..4546a0ca1f4 100644
--- a/app/assets/stylesheets/page_bundles/issuable.scss
+++ b/app/assets/stylesheets/page_bundles/issuable.scss
@@ -1,5 +1,7 @@
 @import 'mixins_and_variables_and_functions';
 
+$issuable-warning-size: 24px;
+
 .status-box {
   padding: 0 $gl-btn-padding;
   border-radius: $border-radius-default;
@@ -18,7 +20,6 @@
   width: $issuable-warning-size;
   height: $issuable-warning-size;
   text-align: center;
-  margin-right: $issuable-warning-icon-margin;
   line-height: $gl-line-height-24;
   flex: 0 0 auto;
 }
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 0c9d151e3cd..38686d5e713 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -136,7 +136,7 @@
   }
 
   .icon {
-    margin-right: $issuable-warning-icon-margin;
+    margin-right: $gl-padding-4;
     vertical-align: text-bottom;
     fill: $orange-600;
   }