diff options
| author | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-08-06 00:59:20 +0300 |
|---|---|---|
| committer | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-06 00:59:20 +0300 |
| commit | 96d10213714c6d463b02b768525d7411ae6bd3d0 (patch) | |
| tree | 8be4ab85b9100708888bee16fbbe96ce1e0a5e8a /app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue | |
| parent | d2aeae589dee0a65181a79feaa69713750ee6013 (diff) | |
Revert "Make status icon in merge widget borderless"
This reverts commit c3751046d217008404a0bd371e59d6ffd6734923.
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue | 11 |
1 files changed, 7 insertions, 4 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 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" |