Skip to content
Snippets Groups Projects
Commit f815b48f authored by Clement Ho's avatar Clement Ho Committed by Mike Greiling
Browse files

Use gitlab-ui loading icon

parent 85aeaf05
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Showing
with 27 additions and 65 deletions
<script> <script>
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
import Tooltip from '~/vue_shared/directives/tooltip'; import Tooltip from '~/vue_shared/directives/tooltip';
   
export default { export default {
name: 'Badge', name: 'Badge',
components: { components: {
Icon, Icon,
LoadingIcon,
Tooltip, Tooltip,
}, },
directives: { directives: {
Loading
@@ -80,7 +78,7 @@ export default {
Loading
@@ -80,7 +78,7 @@ export default {
/> />
</a> </a>
   
<loading-icon <gl-loading-icon
v-show="isLoading" v-show="isLoading"
:inline="true" :inline="true"
/> />
Loading
Loading
Loading
@@ -4,7 +4,6 @@ import { mapActions, mapState } from 'vuex';
Loading
@@ -4,7 +4,6 @@ import { mapActions, mapState } from 'vuex';
import createFlash from '~/flash'; import createFlash from '~/flash';
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import LoadingButton from '~/vue_shared/components/loading_button.vue'; import LoadingButton from '~/vue_shared/components/loading_button.vue';
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
import createEmptyBadge from '../empty_badge'; import createEmptyBadge from '../empty_badge';
import Badge from './badge.vue'; import Badge from './badge.vue';
   
Loading
@@ -15,7 +14,6 @@ export default {
Loading
@@ -15,7 +14,6 @@ export default {
components: { components: {
Badge, Badge,
LoadingButton, LoadingButton,
LoadingIcon,
}, },
props: { props: {
isEditing: { isEditing: {
Loading
@@ -207,7 +205,7 @@ export default {
Loading
@@ -207,7 +205,7 @@ export default {
:link-url="renderedLinkUrl" :link-url="renderedLinkUrl"
/> />
<p v-show="isRendering"> <p v-show="isRendering">
<loading-icon <gl-loading-icon
:inline="true" :inline="true"
/> />
</p> </p>
Loading
Loading
<script> <script>
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
import BadgeListRow from './badge_list_row.vue'; import BadgeListRow from './badge_list_row.vue';
import { GROUP_BADGE } from '../constants'; import { GROUP_BADGE } from '../constants';
   
Loading
@@ -8,7 +7,6 @@ export default {
Loading
@@ -8,7 +7,6 @@ export default {
name: 'BadgeList', name: 'BadgeList',
components: { components: {
BadgeListRow, BadgeListRow,
LoadingIcon,
}, },
computed: { computed: {
...mapState(['badges', 'isLoading', 'kind']), ...mapState(['badges', 'isLoading', 'kind']),
Loading
@@ -31,10 +29,10 @@ export default {
Loading
@@ -31,10 +29,10 @@ export default {
class="badge badge-pill" class="badge badge-pill"
>{{ badges.length }}</span> >{{ badges.length }}</span>
</div> </div>
<loading-icon <gl-loading-icon
v-show="isLoading" v-show="isLoading"
:size="2"
class="card-body" class="card-body"
size="2"
/> />
<div <div
v-if="hasNoBadges" v-if="hasNoBadges"
Loading
Loading
Loading
@@ -2,7 +2,6 @@
Loading
@@ -2,7 +2,6 @@
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
import { PROJECT_BADGE } from '../constants'; import { PROJECT_BADGE } from '../constants';
import Badge from './badge.vue'; import Badge from './badge.vue';
   
Loading
@@ -11,7 +10,6 @@ export default {
Loading
@@ -11,7 +10,6 @@ export default {
components: { components: {
Badge, Badge,
Icon, Icon,
LoadingIcon,
}, },
props: { props: {
badge: { badge: {
Loading
@@ -79,7 +77,7 @@ export default {
Loading
@@ -79,7 +77,7 @@ export default {
name="remove" name="remove"
/> />
</button> </button>
<loading-icon <gl-loading-icon
v-show="badge.isDeleting" v-show="badge.isDeleting"
:inline="true" :inline="true"
/> />
Loading
Loading
Loading
@@ -3,7 +3,6 @@ import Sortable from 'sortablejs';
Loading
@@ -3,7 +3,6 @@ import Sortable from 'sortablejs';
import boardNewIssue from './board_new_issue.vue'; import boardNewIssue from './board_new_issue.vue';
import boardCard from './board_card.vue'; import boardCard from './board_card.vue';
import eventHub from '../eventhub'; import eventHub from '../eventhub';
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
   
const Store = gl.issueBoards.BoardsStore; const Store = gl.issueBoards.BoardsStore;
   
Loading
@@ -12,7 +11,6 @@ export default {
Loading
@@ -12,7 +11,6 @@ export default {
components: { components: {
boardCard, boardCard,
boardNewIssue, boardNewIssue,
loadingIcon,
}, },
props: { props: {
groupId: { groupId: {
Loading
@@ -217,7 +215,7 @@ export default {
Loading
@@ -217,7 +215,7 @@ export default {
v-if="loading" v-if="loading"
class="board-list-loading text-center" class="board-list-loading text-center"
aria-label="Loading issues"> aria-label="Loading issues">
<loading-icon /> <gl-loading-icon />
</div> </div>
<board-new-issue <board-new-issue
v-if="list.type !== 'closed' && showIssueForm" v-if="list.type !== 'closed' && showIssueForm"
Loading
@@ -245,7 +243,7 @@ export default {
Loading
@@ -245,7 +243,7 @@ export default {
v-if="showCount" v-if="showCount"
class="board-list-count text-center" class="board-list-count text-center"
data-issue-id="-1"> data-issue-id="-1">
<loading-icon <gl-loading-icon
v-show="list.loadingMore" v-show="list.loadingMore"
label="Loading more issues" label="Loading more issues"
/> />
Loading
Loading
<script> <script>
/* global ListIssue */ /* global ListIssue */
import { urlParamsToObject } from '~/lib/utils/common_utils'; import { urlParamsToObject } from '~/lib/utils/common_utils';
import loadingIcon from '~/vue_shared/components/loading_icon.vue';
import ModalHeader from './header.vue'; import ModalHeader from './header.vue';
import ModalList from './list.vue'; import ModalList from './list.vue';
import ModalFooter from './footer.vue'; import ModalFooter from './footer.vue';
Loading
@@ -14,7 +13,6 @@
Loading
@@ -14,7 +13,6 @@
ModalHeader, ModalHeader,
ModalList, ModalList,
ModalFooter, ModalFooter,
loadingIcon,
}, },
props: { props: {
newIssuePath: { newIssuePath: {
Loading
@@ -167,7 +165,7 @@
Loading
@@ -167,7 +165,7 @@
class="add-issues-list text-center" class="add-issues-list text-center"
> >
<div class="add-issues-list-loading"> <div class="add-issues-list-loading">
<loading-icon /> <gl-loading-icon />
</div> </div>
</section> </section>
<modal-footer/> <modal-footer/>
Loading
Loading
Loading
@@ -2,14 +2,10 @@
Loading
@@ -2,14 +2,10 @@
import $ from 'jquery'; import $ from 'jquery';
import _ from 'underscore'; import _ from 'underscore';
import eventHub from '../eventhub'; import eventHub from '../eventhub';
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import Api from '../../api'; import Api from '../../api';
   
export default { export default {
name: 'BoardProjectSelect', name: 'BoardProjectSelect',
components: {
loadingIcon,
},
props: { props: {
groupId: { groupId: {
type: Number, type: Number,
Loading
@@ -119,7 +115,7 @@ export default {
Loading
@@ -119,7 +115,7 @@ export default {
</div> </div>
<div class="dropdown-content"></div> <div class="dropdown-content"></div>
<div class="dropdown-loading"> <div class="dropdown-loading">
<loading-icon /> <gl-loading-icon />
</div> </div>
</div> </div>
</div> </div>
Loading
Loading
Loading
@@ -76,10 +76,10 @@
Loading
@@ -76,10 +76,10 @@
<template> <template>
<div class="content-list pipelines"> <div class="content-list pipelines">
   
<loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:label="s__('Pipelines|Loading Pipelines')" :label="s__('Pipelines|Loading Pipelines')"
size="3" :size="3"
class="prepend-top-20" class="prepend-top-20"
/> />
   
Loading
Loading
import Vue from 'vue'; import Vue from 'vue';
import progressBar from '@gitlab-org/gitlab-ui/dist/components/base/progress_bar'; import progressBar from '@gitlab-org/gitlab-ui/dist/components/base/progress_bar';
import modal from '@gitlab-org/gitlab-ui/dist/components/base/modal'; import modal from '@gitlab-org/gitlab-ui/dist/components/base/modal';
import loadingIcon from '@gitlab-org/gitlab-ui/dist/components/base/loading_icon';
   
import dModal from '@gitlab-org/gitlab-ui/dist/directives/modal'; import dModal from '@gitlab-org/gitlab-ui/dist/directives/modal';
import dTooltip from '@gitlab-org/gitlab-ui/dist/directives/tooltip'; import dTooltip from '@gitlab-org/gitlab-ui/dist/directives/tooltip';
   
Vue.component('gl-progress-bar', progressBar); Vue.component('gl-progress-bar', progressBar);
Vue.component('gl-ui-modal', modal); Vue.component('gl-ui-modal', modal);
Vue.component('gl-loading-icon', loadingIcon);
   
Vue.directive('gl-modal', dModal); Vue.directive('gl-modal', dModal);
Vue.directive('gl-tooltip', dTooltip); Vue.directive('gl-tooltip', dTooltip);
<script> <script>
import loadingIcon from '~/vue_shared/components/loading_icon.vue';
import eventHub from '../eventhub'; import eventHub from '../eventhub';
   
export default { export default {
components: {
loadingIcon,
},
props: { props: {
deployKey: { deployKey: {
type: Object, type: Object,
Loading
@@ -45,7 +41,7 @@ export default {
Loading
@@ -45,7 +41,7 @@ export default {
class="btn" class="btn"
@click="doAction"> @click="doAction">
<slot></slot> <slot></slot>
<loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:inline="true" :inline="true"
/> />
Loading
Loading
<script> <script>
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import Flash from '~/flash'; import Flash from '~/flash';
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue';
import eventHub from '../eventhub'; import eventHub from '../eventhub';
import DeployKeysService from '../service'; import DeployKeysService from '../service';
Loading
@@ -11,7 +10,6 @@ import KeysPanel from './keys_panel.vue';
Loading
@@ -11,7 +10,6 @@ import KeysPanel from './keys_panel.vue';
export default { export default {
components: { components: {
KeysPanel, KeysPanel,
LoadingIcon,
NavigationTabs, NavigationTabs,
}, },
props: { props: {
Loading
@@ -114,10 +112,10 @@ export default {
Loading
@@ -114,10 +112,10 @@ export default {
   
<template> <template>
<div class="append-bottom-default deploy-keys"> <div class="append-bottom-default deploy-keys">
<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="2"
/> />
<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">
Loading
Loading
Loading
@@ -4,7 +4,6 @@ import Icon from '~/vue_shared/components/icon.vue';
Loading
@@ -4,7 +4,6 @@ import Icon from '~/vue_shared/components/icon.vue';
import { __ } from '~/locale'; import { __ } from '~/locale';
import createFlash from '~/flash'; import createFlash from '~/flash';
import eventHub from '../../notes/event_hub'; import eventHub from '../../notes/event_hub';
import LoadingIcon from '../../vue_shared/components/loading_icon.vue';
import CompareVersions from './compare_versions.vue'; import CompareVersions from './compare_versions.vue';
import ChangedFiles from './changed_files.vue'; import ChangedFiles from './changed_files.vue';
import DiffFile from './diff_file.vue'; import DiffFile from './diff_file.vue';
Loading
@@ -15,7 +14,6 @@ export default {
Loading
@@ -15,7 +14,6 @@ export default {
name: 'DiffsApp', name: 'DiffsApp',
components: { components: {
Icon, Icon,
LoadingIcon,
CompareVersions, CompareVersions,
ChangedFiles, ChangedFiles,
DiffFile, DiffFile,
Loading
@@ -168,7 +166,7 @@ export default {
Loading
@@ -168,7 +166,7 @@ export default {
v-if="isLoading" v-if="isLoading"
class="loading" class="loading"
> >
<loading-icon /> <gl-loading-icon />
</div> </div>
<div <div
v-else v-else
Loading
Loading
Loading
@@ -3,7 +3,6 @@ import { mapActions, mapGetters } from 'vuex';
Loading
@@ -3,7 +3,6 @@ import { mapActions, mapGetters } from 'vuex';
import _ from 'underscore'; import _ from 'underscore';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import createFlash from '~/flash'; import createFlash from '~/flash';
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
import DiffFileHeader from './diff_file_header.vue'; import DiffFileHeader from './diff_file_header.vue';
import DiffContent from './diff_content.vue'; import DiffContent from './diff_content.vue';
   
Loading
@@ -11,7 +10,6 @@ export default {
Loading
@@ -11,7 +10,6 @@ export default {
components: { components: {
DiffFileHeader, DiffFileHeader,
DiffContent, DiffContent,
LoadingIcon,
}, },
props: { props: {
file: { file: {
Loading
@@ -144,7 +142,7 @@ export default {
Loading
@@ -144,7 +142,7 @@ export default {
:class="{ hidden: isCollapsed || file.tooLarge }" :class="{ hidden: isCollapsed || file.tooLarge }"
:diff-file="file" :diff-file="file"
/> />
<loading-icon <gl-loading-icon
v-if="showLoadingIcon" v-if="showLoadingIcon"
class="diff-content loading" class="diff-content loading"
/> />
Loading
Loading
<script> <script>
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import tablePagination from '../../vue_shared/components/table_pagination.vue'; import tablePagination from '../../vue_shared/components/table_pagination.vue';
import environmentTable from '../components/environments_table.vue'; import environmentTable from '../components/environments_table.vue';
   
export default { export default {
components: { components: {
environmentTable, environmentTable,
loadingIcon,
tablePagination, tablePagination,
}, },
props: { props: {
Loading
@@ -42,11 +40,11 @@
Loading
@@ -42,11 +40,11 @@
<template> <template>
<div class="environments-container"> <div class="environments-container">
   
<loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:size="3"
class="prepend-top-default" class="prepend-top-default"
label="Loading environments" label="Loading environments"
size="3"
/> />
   
<slot name="emptyState"></slot> <slot name="emptyState"></slot>
Loading
Loading
<script> <script>
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
   
export default { export default {
Loading
@@ -9,7 +8,6 @@ export default {
Loading
@@ -9,7 +8,6 @@ export default {
tooltip, tooltip,
}, },
components: { components: {
loadingIcon,
Icon, Icon,
}, },
props: { props: {
Loading
@@ -67,7 +65,7 @@ export default {
Loading
@@ -67,7 +65,7 @@ export default {
aria-hidden="true" aria-hidden="true"
> >
</i> </i>
<loading-icon v-if="isLoading" /> <gl-loading-icon v-if="isLoading" />
</span> </span>
</button> </button>
   
Loading
Loading
Loading
@@ -9,12 +9,10 @@ import { s__ } from '~/locale';
Loading
@@ -9,12 +9,10 @@ import { s__ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import tooltip from '~/vue_shared/directives/tooltip'; import tooltip from '~/vue_shared/directives/tooltip';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import LoadingIcon from '../../vue_shared/components/loading_icon.vue';
   
export default { export default {
components: { components: {
Icon, Icon,
LoadingIcon,
}, },
   
directives: { directives: {
Loading
@@ -70,6 +68,6 @@ export default {
Loading
@@ -70,6 +68,6 @@ export default {
v-else v-else
name="redo"/> name="redo"/>
   
<loading-icon v-if="isLoading" /> <gl-loading-icon v-if="isLoading" />
</button> </button>
</template> </template>
Loading
@@ -2,13 +2,11 @@
Loading
@@ -2,13 +2,11 @@
/** /**
* Render environments table. * Render environments table.
*/ */
import loadingIcon from '~/vue_shared/components/loading_icon.vue';
import environmentItem from './environment_item.vue'; import environmentItem from './environment_item.vue';
   
export default { export default {
components: { components: {
environmentItem, environmentItem,
loadingIcon,
}, },
   
props: { props: {
Loading
@@ -97,7 +95,7 @@ export default {
Loading
@@ -97,7 +95,7 @@ export default {
<div <div
v-if="model.isLoadingFolderContent" v-if="model.isLoadingFolderContent"
:key="`loading-item-${i}`"> :key="`loading-item-${i}`">
<loading-icon size="2" /> <gl-loading-icon :size="2" />
</div> </div>
   
<template v-else> <template v-else>
Loading
Loading
Loading
@@ -13,7 +13,6 @@ import eventHub from '../event_hub';
Loading
@@ -13,7 +13,6 @@ import eventHub from '../event_hub';
   
import EnvironmentsStore from '../stores/environments_store'; import EnvironmentsStore from '../stores/environments_store';
import EnvironmentsService from '../services/environments_service'; import EnvironmentsService from '../services/environments_service';
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import tablePagination from '../../vue_shared/components/table_pagination.vue'; import tablePagination from '../../vue_shared/components/table_pagination.vue';
import environmentTable from '../components/environments_table.vue'; import environmentTable from '../components/environments_table.vue';
import tabs from '../../vue_shared/components/navigation_tabs.vue'; import tabs from '../../vue_shared/components/navigation_tabs.vue';
Loading
@@ -24,7 +23,6 @@ export default {
Loading
@@ -24,7 +23,6 @@ export default {
components: { components: {
environmentTable, environmentTable,
container, container,
loadingIcon,
tabs, tabs,
tablePagination, tablePagination,
}, },
Loading
Loading
<script> <script>
import { mapState, mapActions, mapGetters } from 'vuex'; import { mapState, mapActions, mapGetters } from 'vuex';
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
import AccessorUtilities from '~/lib/utils/accessor'; import AccessorUtilities from '~/lib/utils/accessor';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import store from '../store/'; import store from '../store/';
Loading
@@ -13,7 +12,6 @@ import frequentItemsMixin from './frequent_items_mixin';
Loading
@@ -13,7 +12,6 @@ import frequentItemsMixin from './frequent_items_mixin';
export default { export default {
store, store,
components: { components: {
LoadingIcon,
FrequentItemsSearchInput, FrequentItemsSearchInput,
FrequentItemsList, FrequentItemsList,
}, },
Loading
@@ -98,11 +96,11 @@ export default {
Loading
@@ -98,11 +96,11 @@ export default {
<frequent-items-search-input <frequent-items-search-input
:namespace="namespace" :namespace="namespace"
/> />
<loading-icon <gl-loading-icon
v-if="isLoadingItems" v-if="isLoadingItems"
:label="translations.loadingMessage" :label="translations.loadingMessage"
:size="2"
class="loading-animation prepend-top-20" class="loading-animation prepend-top-20"
size="2"
/> />
<div <div
v-if="!isLoadingItems && !hasSearchQuery" v-if="!isLoadingItems && !hasSearchQuery"
Loading
Loading
Loading
@@ -3,7 +3,6 @@
Loading
@@ -3,7 +3,6 @@
   
import $ from 'jquery'; import $ from 'jquery';
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import loadingIcon from '~/vue_shared/components/loading_icon.vue';
import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue'; import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
import { HIDDEN_CLASS } from '~/lib/utils/constants'; import { HIDDEN_CLASS } from '~/lib/utils/constants';
import { getParameterByName } from '~/lib/utils/common_utils'; import { getParameterByName } from '~/lib/utils/common_utils';
Loading
@@ -15,7 +14,6 @@ import groupsComponent from './groups.vue';
Loading
@@ -15,7 +14,6 @@ import groupsComponent from './groups.vue';
   
export default { export default {
components: { components: {
loadingIcon,
DeprecatedModal, DeprecatedModal,
groupsComponent, groupsComponent,
}, },
Loading
@@ -241,11 +239,11 @@ export default {
Loading
@@ -241,11 +239,11 @@ export default {
   
<template> <template>
<div> <div>
<loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
:label="s__('GroupsTree|Loading groups')" :label="s__('GroupsTree|Loading groups')"
:size="2"
class="loading-animation prepend-top-20" class="loading-animation prepend-top-20"
size="2"
/> />
<groups-component <groups-component
v-if="!isLoading" v-if="!isLoading"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment