Commit 85b273d7 authored by Natalia Tepluhina's avatar Natalia Tepluhina

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

Replace deprecated GlLoadingIcon sizes

See merge request gitlab-org/gitlab!29417
parents b6f832a5 910221b1
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
{{ s__('Badges|Your badges') }} {{ s__('Badges|Your badges') }}
<span v-show="!isLoading" class="badge badge-pill">{{ badges.length }}</span> <span v-show="!isLoading" class="badge badge-pill">{{ badges.length }}</span>
</div> </div>
<gl-loading-icon v-show="isLoading" :size="2" class="card-body" /> <gl-loading-icon v-show="isLoading" size="lg" class="card-body" />
<div v-if="hasNoBadges" class="card-body"> <div v-if="hasNoBadges" class="card-body">
<span v-if="isGroupBadge">{{ s__('Badges|This group has no badges') }}</span> <span v-if="isGroupBadge">{{ s__('Badges|This group has no badges') }}</span>
<span v-else>{{ s__('Badges|This project has no badges') }}</span> <span v-else>{{ s__('Badges|This project has no badges') }}</span>
......
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
<template> <template>
<div> <div>
<div v-if="loading" class="contributors-loader text-center"> <div v-if="loading" class="contributors-loader text-center">
<gl-loading-icon :inline="true" :size="4" /> <gl-loading-icon :inline="true" size="xl" />
</div> </div>
<div v-else-if="showChart" class="contributors-charts"> <div v-else-if="showChart" class="contributors-charts">
......
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
<gl-loading-icon <gl-loading-icon
v-if="isLoading && !hasKeys" v-if="isLoading && !hasKeys"
:label="s__('DeployKeys|Loading deploy keys')" :label="s__('DeployKeys|Loading deploy keys')"
:size="2" size="lg"
/> />
<template v-else-if="hasKeys"> <template v-else-if="hasKeys">
<div class="top-area scrolling-tabs-container inner-page-scroll-tabs"> <div class="top-area scrolling-tabs-container inner-page-scroll-tabs">
......
...@@ -225,7 +225,7 @@ export default { ...@@ -225,7 +225,7 @@ export default {
<template> <template>
<div> <div>
<div v-if="errorLoading" class="py-3"> <div v-if="errorLoading" class="py-3">
<gl-loading-icon :size="3" /> <gl-loading-icon size="lg" />
</div> </div>
<div v-else-if="error" class="error-details"> <div v-else-if="error" class="error-details">
<gl-alert v-if="isAlertVisible" @dismiss="isAlertVisible = false"> <gl-alert v-if="isAlertVisible" @dismiss="isAlertVisible = false">
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
</ul> </ul>
<div v-if="loadingStacktrace" class="py-3"> <div v-if="loadingStacktrace" class="py-3">
<gl-loading-icon :size="3" /> <gl-loading-icon size="lg" />
</div> </div>
<template v-else-if="showStacktrace"> <template v-else-if="showStacktrace">
......
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
<gl-loading-icon <gl-loading-icon
v-if="isLoadingItems" v-if="isLoadingItems"
:label="translations.loadingMessage" :label="translations.loadingMessage"
:size="2" size="lg"
class="loading-animation prepend-top-20" class="loading-animation prepend-top-20"
/> />
<div v-if="!isLoadingItems && !hasSearchQuery" class="section-header"> <div v-if="!isLoadingItems && !hasSearchQuery" class="section-header">
......
...@@ -72,7 +72,7 @@ export default { ...@@ -72,7 +72,7 @@ export default {
<div class="dropdown-content ide-merge-requests-dropdown-content d-flex"> <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
<gl-loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:size="2" size="lg"
class="mt-3 mb-3 align-self-center ml-auto mr-auto" class="mt-3 mb-3 align-self-center ml-auto mr-auto"
/> />
<ul v-else class="mb-0 w-100"> <ul v-else class="mb-0 w-100">
......
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
<i aria-hidden="true" class="fa fa-search dropdown-input-search"></i> <i aria-hidden="true" class="fa fa-search dropdown-input-search"></i>
</div> </div>
<div class="dropdown-content"> <div class="dropdown-content">
<gl-loading-icon v-if="showLoading" :size="2" /> <gl-loading-icon v-if="showLoading" size="lg" />
<ul v-else> <ul v-else>
<li v-for="(item, index) in outputData" :key="index"> <li v-for="(item, index) in outputData" :key="index">
<button type="button" @click="clickItem(item)">{{ item.name }}</button> <button type="button" @click="clickItem(item)">{{ item.name }}</button>
......
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
<template> <template>
<div> <div>
<gl-loading-icon v-if="loading && !stages.length" :size="2" class="prepend-top-default" /> <gl-loading-icon v-if="loading && !stages.length" size="lg" class="prepend-top-default" />
<template v-else> <template v-else>
<stage <stage
v-for="stage in stages" v-for="stage in stages"
......
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
<div class="dropdown-content ide-merge-requests-dropdown-content d-flex"> <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
<gl-loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:size="2" size="lg"
class="mt-3 mb-3 align-self-center ml-auto mr-auto" class="mt-3 mb-3 align-self-center ml-auto mr-auto"
/> />
<template v-else> <template v-else>
......
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
<template> <template>
<div class="ide-pipeline"> <div class="ide-pipeline">
<gl-loading-icon v-if="showLoadingIcon" :size="2" class="prepend-top-default" /> <gl-loading-icon v-if="showLoadingIcon" size="lg" class="prepend-top-default" />
<template v-else-if="hasLoadedPipeline"> <template v-else-if="hasLoadedPipeline">
<header v-if="latestPipeline" class="ide-tree-header ide-pipeline-header"> <header v-if="latestPipeline" class="ide-tree-header ide-pipeline-header">
<ci-icon :status="latestPipeline.details.status" :size="24" class="d-flex" /> <ci-icon :status="latestPipeline.details.status" :size="24" class="d-flex" />
......
...@@ -176,6 +176,6 @@ export default { ...@@ -176,6 +176,6 @@ export default {
{{ s__('IDE|Get started with Live Preview') }} {{ s__('IDE|Get started with Live Preview') }}
</a> </a>
</div> </div>
<gl-loading-icon v-else :size="2" class="align-self-center mt-auto mb-auto" /> <gl-loading-icon v-else size="lg" class="align-self-center mt-auto mb-auto" />
</div> </div>
</template> </template>
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
paddingRight: `${graphRightPadding}px`, paddingRight: `${graphRightPadding}px`,
}" }"
> >
<gl-loading-icon v-if="isLoading" class="m-auto" :size="3" /> <gl-loading-icon v-if="isLoading" class="m-auto" size="lg" />
<pipeline-graph <pipeline-graph
v-if="pipelineTypeUpstream" v-if="pipelineTypeUpstream"
......
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
/> />
</ci-header> </ci-header>
<gl-loading-icon v-if="isLoading" :size="2" class="prepend-top-default append-bottom-default" /> <gl-loading-icon v-if="isLoading" size="lg" class="prepend-top-default append-bottom-default" />
<gl-modal <gl-modal
:modal-id="$options.DELETE_MODAL_ID" :modal-id="$options.DELETE_MODAL_ID"
......
...@@ -271,7 +271,7 @@ export default { ...@@ -271,7 +271,7 @@ export default {
<gl-loading-icon <gl-loading-icon
v-if="stateToRender === $options.stateMap.loading" v-if="stateToRender === $options.stateMap.loading"
:label="s__('Pipelines|Loading Pipelines')" :label="s__('Pipelines|Loading Pipelines')"
:size="3" size="lg"
class="prepend-top-20" class="prepend-top-20"
/> />
......
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
</script> </script>
<template> <template>
<div class="ci-status-link"> <div class="ci-status-link">
<gl-loading-icon v-if="isLoading" :size="3" label="Loading pipeline status" /> <gl-loading-icon v-if="isLoading" size="lg" label="Loading pipeline status" />
<a v-else :href="ciStatus.details_path"> <a v-else :href="ciStatus.details_path">
<ci-icon <ci-icon
v-tooltip v-tooltip
......
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
</div> </div>
</div> </div>
<div v-if="loadingStacktrace" class="card"> <div v-if="loadingStacktrace" class="card">
<gl-loading-icon class="py-2" label="Fetching stack trace" :size="1" /> <gl-loading-icon class="py-2" label="Fetching stack trace" size="sm" />
</div> </div>
<stacktrace v-else :entries="stacktrace" /> <stacktrace v-else :entries="stacktrace" />
</div> </div>
......
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
<section id="serverless-functions" class="flex-grow"> <section id="serverless-functions" class="flex-grow">
<gl-loading-icon <gl-loading-icon
v-if="checkingInstalled" v-if="checkingInstalled"
:size="2" size="lg"
class="prepend-top-default append-bottom-default" class="prepend-top-default append-bottom-default"
/> />
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
</template> </template>
<gl-loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:size="2" size="lg"
class="prepend-top-default append-bottom-default js-functions-loader" class="prepend-top-default append-bottom-default js-functions-loader"
/> />
</div> </div>
......
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
<gl-loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:label="__('Loading snippet')" :label="__('Loading snippet')"
:size="2" size="lg"
class="loading-animation prepend-top-20 append-bottom-20" class="loading-animation prepend-top-20 append-bottom-20"
/> />
<template v-else> <template v-else>
......
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
<gl-loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:label="__('Loading snippet')" :label="__('Loading snippet')"
:size="2" size="lg"
class="loading-animation prepend-top-20 append-bottom-20" class="loading-animation prepend-top-20 append-bottom-20"
/> />
<blob-content-edit <blob-content-edit
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
@input="onInput" @input="onInput"
/> />
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<gl-loading-icon v-if="showLoadingIndicator" :size="1" class="py-2 px-4" /> <gl-loading-icon v-if="showLoadingIndicator" size="sm" class="py-2 px-4" />
<gl-infinite-scroll <gl-infinite-scroll
:max-list-height="402" :max-list-height="402"
:fetched-items="projectSearchResults.length" :fetched-items="projectSearchResults.length"
......
---
title: Replace deprecated GlLoadingIcon sizes
merge_request: 29417
author:
type: fixed
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