Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/badges/components/badge_form.vue')
-rw-r--r--app/assets/javascripts/badges/components/badge_form.vue30
1 files changed, 15 insertions, 15 deletions
diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue
index 08834df0a9b..6afb10dd2ad 100644
--- a/app/assets/javascripts/badges/components/badge_form.vue
+++ b/app/assets/javascripts/badges/components/badge_form.vue
@@ -1,10 +1,10 @@
<script>
+/* eslint-disable vue/no-v-html */
import { escape, debounce } from 'lodash';
import { mapActions, mapState } from 'vuex';
-import { GlLoadingIcon, GlFormInput, GlFormGroup } from '@gitlab/ui';
+import { GlLoadingIcon, GlFormInput, GlFormGroup, GlButton } from '@gitlab/ui';
import { deprecatedCreateFlash as createFlash } from '~/flash';
import { s__, sprintf } from '~/locale';
-import LoadingButton from '~/vue_shared/components/loading_button.vue';
import createEmptyBadge from '../empty_badge';
import Badge from './badge.vue';
@@ -14,7 +14,7 @@ export default {
name: 'BadgeForm',
components: {
Badge,
- LoadingButton,
+ GlButton,
GlLoadingIcon,
GlFormInput,
GlFormGroup,
@@ -219,23 +219,23 @@ export default {
</div>
<div v-if="isEditing" class="row-content-block gl-display-flex gl-justify-content-end">
- <button class="btn btn-cancel gl-mr-4" type="button" @click="onCancel">
+ <gl-button class="btn-cancel gl-mr-4" data-testid="cancelEditing" @click="onCancel">
{{ __('Cancel') }}
- </button>
- <loading-button
+ </gl-button>
+ <gl-button
:loading="isSaving"
- :label="s__('Badges|Save changes')"
type="submit"
- container-class="btn btn-success"
- />
+ variant="success"
+ category="primary"
+ data-testid="saveEditing"
+ >
+ {{ s__('Badges|Save changes') }}
+ </gl-button>
</div>
<div v-else class="gl-display-flex gl-justify-content-end form-group">
- <loading-button
- :loading="isSaving"
- :label="s__('Badges|Add badge')"
- type="submit"
- container-class="btn btn-success"
- />
+ <gl-button :loading="isSaving" type="submit" variant="success" category="primary">
+ {{ s__('Badges|Add badge') }}
+ </gl-button>
</div>
</form>
</template>