diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-09 18:07:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-09 18:07:50 +0300 |
commit | fb19b392e2331e7663c3d65c05aeb81a1db3630d (patch) | |
tree | edec8b9bfc56a39279df88578ccb6da5ca4783b4 /app/assets/javascripts/vue_shared | |
parent | e4b9c52cc9ca9478d9881d03f31517be46376060 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue index e546ca57c5e..181c1b89e31 100644 --- a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue +++ b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue @@ -248,7 +248,7 @@ export default { __('Cancel') }}</gl-button> <gl-button - variant="success" + variant="confirm" category="primary" :disabled="!isValid" @click="setFixedRange()" diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue index 3ec33a653b8..2cccb8325f4 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue @@ -104,7 +104,7 @@ export default { <gl-button :disabled="disableCreate" category="primary" - variant="success" + variant="confirm" class="float-left d-flex align-items-center" @click="handleCreateClick" > |