diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-02 14:35:22 -0500 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-02 14:49:04 -0500 |
| commit | fc012bcb00e7e53095fdb34c8e1551467bc9ac36 (patch) | |
| tree | a00c5bae47998ca042852d43c5e73c9350db8116 | |
| parent | 0818fdb78662795d97e381c9a8c839eb45ab2314 (diff) | |
| download | gitlab-ce-64831-add-padding-to-merged-by-widget.tar.gz | |
Remove .widget-status-icon class with utilities64831-add-padding-to-merged-by-widget
This fixes some spacing issues in mr_widget_status_icon.vue
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 8 |
2 files changed, 7 insertions, 12 deletions
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 4e0f0235236..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 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 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 f0f9cedd8dc..cb7913ee54e 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -262,14 +262,6 @@ } } - .widget-status-icon { - align-self: flex-start; - - button { - margin-left: $gl-padding; - } - } - .mr-widget-body { line-height: 28px; |