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