diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-14 09:10:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-14 09:10:12 +0300 |
commit | bfa9edfd26edc8800556399ebb4c52c5f61a69a6 (patch) | |
tree | e7969cdb4bba6b44581858627b0df6938e97f1c1 /app/assets/javascripts/design_management/pages | |
parent | f5a8ebd6b7da5501100d66b43050be7b26b04665 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/design_management/pages')
-rw-r--r-- | app/assets/javascripts/design_management/pages/index.vue | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/design_management/pages/index.vue b/app/assets/javascripts/design_management/pages/index.vue index 6e130b7c741..1864b848f83 100644 --- a/app/assets/javascripts/design_management/pages/index.vue +++ b/app/assets/javascripts/design_management/pages/index.vue @@ -327,7 +327,7 @@ export default { v-if="isLatestVersion" variant="link" size="small" - class="gl-mr-2 js-select-all" + class="gl-mr-3 js-select-all" @click="toggleDesignsSelection" >{{ selectAllButtonText }} </gl-button> @@ -340,14 +340,15 @@ export default { <delete-button v-if="isLatestVersion" :is-deleting="loading" - button-variant="danger" - button-class="gl-mr-4" + button-variant="warning" + button-category="secondary" + button-class="gl-mr-3" button-size="small" + :loading="loading" :has-selected-designs="hasSelectedDesigns" @deleteSelectedDesigns="mutate()" > - {{ s__('DesignManagement|Delete selected') }} - <gl-loading-icon v-if="loading" inline class="ml-1" /> + {{ s__('DesignManagement|Archive selected') }} </delete-button> </design-destroyer> <upload-button v-if="canCreateDesign" :is-saving="isSaving" @upload="onUploadDesign" /> |