diff options
| author | Dave Pisek <dpisek@gitlab.com> | 2019-08-06 13:34:34 +1000 |
|---|---|---|
| committer | Dave Pisek <dpisek@gitlab.com> | 2019-08-07 12:24:30 +1000 |
| commit | 8736404729f8893e3b118a381377e3b23d2c605c (patch) | |
| tree | 5653b507a92ad2f7aafc287e0a2f532700c897f9 | |
| parent | ee028785a3e4cebf08cc0a9a2ae969c9f67d675a (diff) | |
| download | gitlab-ce-62609-test-summary-loading-spinner-is-too-large.tar.gz | |
Adjust size and align MR-widget loading icon62609-test-summary-loading-spinner-is-too-large
A recent change within gitlab-ui introduced a new size (24x24)
and changed also some of the existing sizes.
This commit uses the loading-icon's new size (24x24) to bring it to the
same dimensions as the status-icon and applies some styling to
vertically align them.
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 |