diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-07 12:08:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-07 12:08:35 +0300 |
commit | 6b8af95df6c5702343c32ae266b0eb35e06d0546 (patch) | |
tree | 400c0cf36de7be6737ed18d537f8c74e69b604cd /app/assets/javascripts/monitoring | |
parent | 7c33a59ac3b716b38baffbfe5c7f15e8104f3c6f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
5 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/monitoring/components/alert_widget.vue b/app/assets/javascripts/monitoring/components/alert_widget.vue index c18c13f2574..e5d7e2ea2eb 100644 --- a/app/assets/javascripts/monitoring/components/alert_widget.vue +++ b/app/assets/javascripts/monitoring/components/alert_widget.vue @@ -227,7 +227,7 @@ export default { <template> <div class="prometheus-alert-widget dropdown flex-grow-2 overflow-hidden"> - <gl-loading-icon v-if="shouldShowLoadingIcon" :inline="true" /> + <gl-loading-icon v-if="shouldShowLoadingIcon" :inline="true" size="sm" /> <span v-else-if="errorMessage" ref="alertErrorMessage" class="alert-error-message">{{ errorMessage }}</span> diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue index 05b5b760f0a..f53f78a3f13 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_header.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue @@ -197,7 +197,7 @@ export default { <gl-dropdown-section-header>{{ __('Environment') }}</gl-dropdown-section-header> <gl-search-box-by-type @input="debouncedEnvironmentsSearch" /> - <gl-loading-icon v-if="environmentsLoading" :inline="true" /> + <gl-loading-icon v-if="environmentsLoading" size="sm" :inline="true" /> <div v-else class="flex-fill overflow-auto"> <gl-dropdown-item v-for="environment in filteredEnvironments" diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue index 202d18ac721..b786d015f3b 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue @@ -389,7 +389,7 @@ export default { /> <div class="flex-grow-1"></div> <div v-if="graphDataIsLoading" class="mx-1 mt-1"> - <gl-loading-icon /> + <gl-loading-icon size="sm" /> </div> <div v-if="isContextualMenuShown" diff --git a/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue b/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue index 49d7e3a48a7..fd07a41ec37 100644 --- a/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue +++ b/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue @@ -88,7 +88,7 @@ export default { @change="formChange" /> <template #modal-ok> - <gl-loading-icon v-if="loading" inline color="light" /> + <gl-loading-icon v-if="loading" size="sm" inline color="light" /> {{ okButtonText }} </template> </gl-modal> diff --git a/app/assets/javascripts/monitoring/components/graph_group.vue b/app/assets/javascripts/monitoring/components/graph_group.vue index ecb8ef4a0d0..5b73fb4e10d 100644 --- a/app/assets/javascripts/monitoring/components/graph_group.vue +++ b/app/assets/javascripts/monitoring/components/graph_group.vue @@ -61,7 +61,7 @@ export default { <div v-if="showPanels" ref="graph-group" class="card prometheus-panel"> <div class="card-header d-flex align-items-center"> <h4 class="flex-grow-1">{{ name }}</h4> - <gl-loading-icon v-if="isLoading" name="loading" /> + <gl-loading-icon v-if="isLoading" size="sm" name="loading" /> <a data-testid="group-toggle-button" :aria-label="__('Toggle collapse')" |