diff options
author | Mike Greiling <mike@pixelcog.com> | 2019-08-08 06:43:10 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2019-08-08 06:43:10 +0000 |
commit | d2cff9e4f94dd242a95604c38727b12de9e0a138 (patch) | |
tree | c22c132e352f97f40cb3ed89e40bd67fbdb09940 | |
parent | 3a991363f1c3102ddee7ce85050b4928e614f372 (diff) | |
parent | 8736404729f8893e3b118a381377e3b23d2c605c (diff) | |
download | gitlab-ce-d2cff9e4f94dd242a95604c38727b12de9e0a138.tar.gz |
Merge branch '62609-test-summary-loading-spinner-is-too-large' into 'master'
Adjust size and align MR-widget loading icon
Closes #62609
See merge request gitlab-org/gitlab-ce!31503
3 files changed, 11 insertions, 2 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 13e4b061fda..d0df8309dc7 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 @@ -34,8 +34,8 @@ export default { <template> <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 v-if="isLoading" class="mr-widget-icon d-inline-flex"> + <gl-loading-icon size="md" class="mr-loading-icon d-inline-flex" /> </div> <ci-icon v-else :status="statusObj" :size="24" /> </div> diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index cb7913ee54e..3c1e384d6ed 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -208,6 +208,10 @@ font-size: 22px; } + .mr-loading-icon { + margin: 3px 0; + } + .ci-status-icon svg { margin: 3px 0; position: relative; diff --git a/changelogs/unreleased/62609-test-summary-loading-spinner-is-too-large.yml b/changelogs/unreleased/62609-test-summary-loading-spinner-is-too-large.yml new file mode 100644 index 00000000000..f8e4a26dad8 --- /dev/null +++ b/changelogs/unreleased/62609-test-summary-loading-spinner-is-too-large.yml @@ -0,0 +1,5 @@ +--- +title: Adjust size and align MR-widget loading icon +merge_request: 31503 +author: +type: fixed |