From 96d10213714c6d463b02b768525d7411ae6bd3d0 Mon Sep 17 00:00:00 2001
From: Marcel van Remmerden <mvanremmerden@gitlab.com>
Date: Mon, 5 Aug 2019 21:59:20 +0000
Subject: Revert "Make status icon in merge widget borderless"

This reverts commit c3751046d217008404a0bd371e59d6ffd6734923.
---
 .../javascripts/reports/components/report_section.vue    |  2 +-
 .../components/mr_widget_status_icon.vue                 | 11 +++++++----
 app/assets/stylesheets/pages/merge_requests.scss         | 16 ++--------------
 .../unreleased/64831-add-padding-to-merged-by-widget.yml |  5 +++++
 4 files changed, 15 insertions(+), 19 deletions(-)
 create mode 100644 changelogs/unreleased/64831-add-padding-to-merged-by-widget.yml

diff --git a/app/assets/javascripts/reports/components/report_section.vue b/app/assets/javascripts/reports/components/report_section.vue
index 9bc3e6388e3..24612c8681a 100644
--- a/app/assets/javascripts/reports/components/report_section.vue
+++ b/app/assets/javascripts/reports/components/report_section.vue
@@ -166,7 +166,7 @@ export default {
   <section class="media-section">
     <div class="media">
       <status-icon :status="statusIconName" :size="24" />
-      <div class="media-body d-flex flex-align-self-center prepend-left-default">
+      <div class="media-body d-flex flex-align-self-center">
         <span class="js-code-text code-text">
           {{ headerText }}
           <slot :name="slotName"></slot>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
index 8dbd9e52cfe..13e4b061fda 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
@@ -32,10 +32,13 @@ export default {
 };
 </script>
 <template>
-  <div class="d-flex widget-status-icon">
-    <div v-if="isLoading" class="mr-widget-icon"><gl-loading-icon size="sm" /></div>
-
-    <ci-icon v-else :status="statusObj" :size="24" />
+  <div class="d-flex align-self-start">
+    <div class="square s24 h-auto d-flex-center append-right-default">
+      <div v-if="isLoading" class="mr-widget-icon">
+        <gl-loading-icon size="sm" />
+      </div>
+      <ci-icon v-else :status="statusObj" :size="24" />
+    </div>
 
     <button
       v-if="showDisabledButton"
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 2780afa11fa..cb7913ee54e 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -88,7 +88,7 @@
 }
 
 .mr-widget-info {
-  padding-left: $gl-padding-50 - $gl-padding-32;
+  padding-left: $gl-padding;
   padding-right: $gl-padding;
 }
 
@@ -262,23 +262,11 @@
     }
   }
 
-  .widget-status-icon {
-    align-self: flex-start;
-
-    button {
-      margin-left: $gl-padding;
-    }
-  }
-
   .mr-widget-body {
     line-height: 28px;
 
     @include clearfix;
 
-    button {
-      margin-left: $gl-padding;
-    }
-
     .approve-btn {
       margin-right: 5px;
     }
@@ -527,7 +515,7 @@
 }
 
 .mr-links {
-  padding-left: $status-icon-size + $gl-btn-padding;
+  padding-left: $gl-padding-8 + $status-icon-size + $gl-btn-padding;
 
   &:last-child {
     padding-bottom: $gl-padding;
diff --git a/changelogs/unreleased/64831-add-padding-to-merged-by-widget.yml b/changelogs/unreleased/64831-add-padding-to-merged-by-widget.yml
new file mode 100644
index 00000000000..2a45eec78ef
--- /dev/null
+++ b/changelogs/unreleased/64831-add-padding-to-merged-by-widget.yml
@@ -0,0 +1,5 @@
+---
+title: Add space to "merged by" widget
+merge_request: 30972
+author:
+type: fixed
-- 
cgit v1.2.1