Commit b57e0f0e authored by Mark Florian's avatar Mark Florian

Merge branch 'vs-ee-migrate-deprecated-size-in-loading-icon' into 'master'

[EE] Replace deprecated GlLoadingIcon sizes in EE

See merge request gitlab-org/gitlab!29418
parents c18e47b4 6d64647a
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
<template> <template>
<div class="js-approval-rules"> <div class="js-approval-rules">
<gl-loading-icon v-if="!hasLoaded" :size="2" /> <gl-loading-icon v-if="!hasLoaded" size="lg" />
<template v-else> <template v-else>
<div class="border-bottom"> <div class="border-bottom">
<slot name="rules"></slot> <slot name="rules"></slot>
......
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
<preview-item :draft="draft" :is-last="isLast(index)" /> <preview-item :draft="draft" :is-last="isLast(index)" />
</li> </li>
</ul> </ul>
<gl-loading-icon v-else :size="2" class="prepend-top-default append-bottom-default" /> <gl-loading-icon v-else size="lg" class="prepend-top-default append-bottom-default" />
</div> </div>
<div class="dropdown-footer"> <div class="dropdown-footer">
<publish-button <publish-button
......
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
<gl-loading-icon <gl-loading-icon
v-else-if="isLoading && !hasError" v-else-if="isLoading && !hasError"
:label="s__('SubscriptionTable|Loading subscriptions')" :label="s__('SubscriptionTable|Loading subscriptions')"
:size="3" size="lg"
class="prepend-top-10 append-bottom-10" class="prepend-top-10 append-bottom-10"
/> />
</div> </div>
......
...@@ -168,6 +168,6 @@ export default { ...@@ -168,6 +168,6 @@ export default {
</template> </template>
</gl-table> </gl-table>
<gl-loading-icon v-if="isFetching" :size="2" class="mt-3" /> <gl-loading-icon v-if="isFetching" size="lg" class="mt-3" />
</div> </div>
</template> </template>
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
<div class="text-center"> <div class="text-center">
<div v-if="illustrationPath" class="svg-content svg-130"><img :src="illustrationPath" /></div> <div v-if="illustrationPath" class="svg-content svg-130"><img :src="illustrationPath" /></div>
<h4>{{ __('Web Terminal') }}</h4> <h4>{{ __('Web Terminal') }}</h4>
<gl-loading-icon v-if="isLoading" :size="2" class="prepend-top-default" /> <gl-loading-icon v-if="isLoading" size="lg" class="prepend-top-default" />
<template v-else> <template v-else>
<p>{{ __('Run tests against your code live using the Web Terminal') }}</p> <p>{{ __('Run tests against your code live using the Web Terminal') }}</p>
<p> <p>
......
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
</script> </script>
<template> <template>
<div class="issues-analytics-wrapper" data-qa-selector="issues_analytics_wrapper"> <div class="issues-analytics-wrapper" data-qa-selector="issues_analytics_wrapper">
<gl-loading-icon v-if="loading" :size="4" class="issues-analytics-loading" /> <gl-loading-icon v-if="loading" size="xl" class="issues-analytics-loading" />
<div v-if="showChart" class="issues-analytics-chart"> <div v-if="showChart" class="issues-analytics-chart">
<h4 class="chart-title">{{ s__('IssuesAnalytics|Issues created per month') }}</h4> <h4 class="chart-title">{{ s__('IssuesAnalytics|Issues created per month') }}</h4>
......
...@@ -50,7 +50,7 @@ exports[`SubscriptionTable component when created matches the snapshot 1`] = ` ...@@ -50,7 +50,7 @@ exports[`SubscriptionTable component when created matches the snapshot 1`] = `
class="prepend-top-10 append-bottom-10" class="prepend-top-10 append-bottom-10"
color="orange" color="orange"
label="Loading subscriptions" label="Loading subscriptions"
size="3" size="lg"
/> />
</div> </div>
`; `;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment