diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-05 09:09:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-05 09:09:10 +0300 |
commit | 164814285ea73739499025b81d41a66c66581fd0 (patch) | |
tree | ffa66185ff37afd819c9003cde2cf1d30abb2f45 /app/assets/javascripts/design_management | |
parent | dcd7f2bd4be2c192bb33e99ef131a3d270abc6b3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/design_management')
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/design_management/components/delete_button.vue b/app/assets/javascripts/design_management/components/delete_button.vue index fbcce22ec1e..ae2ce7c3e5e 100644 --- a/app/assets/javascripts/design_management/components/delete_button.vue +++ b/app/assets/javascripts/design_management/components/delete_button.vue @@ -63,7 +63,7 @@ export default { title: s__('DesignManagement|Are you sure you want to archive the selected designs?'), actionPrimary: { text: s__('DesignManagement|Archive designs'), - attributes: { variant: 'warning', 'data-qa-selector': 'confirm_archiving_button' }, + attributes: { variant: 'confirm', 'data-qa-selector': 'confirm_archiving_button' }, }, actionCancel: { text: __('Cancel'), diff --git a/app/assets/javascripts/design_management/components/upload/button.vue b/app/assets/javascripts/design_management/components/upload/button.vue index 394ccb3c483..98b7ab5c094 100644 --- a/app/assets/javascripts/design_management/components/upload/button.vue +++ b/app/assets/javascripts/design_management/components/upload/button.vue @@ -38,7 +38,8 @@ export default { " :disabled="isSaving" :loading="isSaving" - variant="default" + category="secondary" + variant="confirm" size="small" @click="openFileUpload" > diff --git a/app/assets/javascripts/design_management/pages/index.vue b/app/assets/javascripts/design_management/pages/index.vue index 3cc22e1519b..04d80dc0069 100644 --- a/app/assets/javascripts/design_management/pages/index.vue +++ b/app/assets/javascripts/design_management/pages/index.vue @@ -379,8 +379,7 @@ export default { <delete-button v-if="isLatestVersion" :is-deleting="loading" - button-variant="warning" - button-category="secondary" + button-variant="default" button-class="gl-mr-3" button-size="small" data-qa-selector="archive_button" |