diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 12:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 12:09:31 +0300 |
commit | 04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch) | |
tree | 7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/vue_shared/components/sidebar | |
parent | 42f41de46525ce0065f02ee07c1a79f5669526a0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/sidebar')
4 files changed, 27 insertions, 24 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue index b9c611d2764..55fa1e4ef9c 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue @@ -1,10 +1,10 @@ <script> import { mapGetters } from 'vuex'; -import { GlButton, GlIcon } from '@gitlab/ui'; +import { GlDeprecatedButton, GlIcon } from '@gitlab/ui'; export default { components: { - GlButton, + GlDeprecatedButton, GlIcon, }, computed: { @@ -14,8 +14,8 @@ export default { </script> <template> - <gl-button class="labels-select-dropdown-button w-100 text-left"> + <gl-deprecated-button class="labels-select-dropdown-button w-100 text-left"> <span class="dropdown-toggle-text">{{ dropdownButtonText }}</span> <gl-icon name="chevron-down" class="pull-right" /> - </gl-button> + </gl-deprecated-button> </template> 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 842b2fdbc43..6bb77f6b6f3 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 @@ -2,7 +2,7 @@ import { mapState, mapActions } from 'vuex'; import { GlTooltipDirective, - GlButton, + GlDeprecatedButton, GlIcon, GlFormInput, GlLink, @@ -11,7 +11,7 @@ import { export default { components: { - GlButton, + GlDeprecatedButton, GlIcon, GlFormInput, GlLink, @@ -60,7 +60,7 @@ export default { <template> <div class="labels-select-contents-create js-labels-create"> <div class="dropdown-title d-flex align-items-center pt-0 pb-2"> - <gl-button + <gl-deprecated-button :aria-label="__('Go back')" variant="link" size="sm" @@ -68,9 +68,9 @@ export default { @click="toggleDropdownContentsCreateView" > <gl-icon name="arrow-left" /> - </gl-button> + </gl-deprecated-button> <span class="flex-grow-1">{{ labelsCreateTitle }}</span> - <gl-button + <gl-deprecated-button :aria-label="__('Close')" variant="link" size="sm" @@ -78,7 +78,7 @@ export default { @click="toggleDropdownContents" > <gl-icon name="close" /> - </gl-button> + </gl-deprecated-button> </div> <div class="dropdown-input"> <gl-form-input @@ -107,7 +107,7 @@ export default { </div> </div> <div class="dropdown-actions clearfix pt-2 px-2"> - <gl-button + <gl-deprecated-button :disabled="disableCreate" variant="primary" class="pull-left d-flex align-items-center" @@ -115,10 +115,13 @@ export default { > <gl-loading-icon v-show="labelCreateInProgress" :inline="true" class="mr-1" /> {{ __('Create') }} - </gl-button> - <gl-button class="pull-right js-btn-cancel-create" @click="toggleDropdownContentsCreateView"> + </gl-deprecated-button> + <gl-deprecated-button + class="pull-right js-btn-cancel-create" + @click="toggleDropdownContentsCreateView" + > {{ __('Cancel') }} - </gl-button> + </gl-deprecated-button> </div> </div> </template> diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue index a3494a9e38f..a8e48bfe1a1 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue @@ -1,13 +1,13 @@ <script> import { mapState, mapGetters, mapActions } from 'vuex'; -import { GlLoadingIcon, GlButton, GlIcon, GlSearchBoxByType, GlLink } from '@gitlab/ui'; +import { GlLoadingIcon, GlDeprecatedButton, GlIcon, GlSearchBoxByType, GlLink } from '@gitlab/ui'; import { UP_KEY_CODE, DOWN_KEY_CODE, ENTER_KEY_CODE, ESC_KEY_CODE } from '~/lib/utils/keycodes'; export default { components: { GlLoadingIcon, - GlButton, + GlDeprecatedButton, GlIcon, GlSearchBoxByType, GlLink, @@ -125,7 +125,7 @@ export default { /> <div class="dropdown-title d-flex align-items-center pt-0 pb-2"> <span class="flex-grow-1">{{ labelsListTitle }}</span> - <gl-button + <gl-deprecated-button :aria-label="__('Close')" variant="link" size="sm" @@ -133,7 +133,7 @@ export default { @click="toggleDropdownContents" > <gl-icon name="close" /> - </gl-button> + </gl-deprecated-button> </div> <div class="dropdown-input"> <gl-search-box-by-type v-model="searchKey" :autofocus="true" /> @@ -160,11 +160,11 @@ export default { <div class="dropdown-footer"> <ul class="list-unstyled"> <li> - <gl-button + <gl-deprecated-button variant="link" class="d-flex w-100 flex-row text-break-word label-item" @click="toggleDropdownContentsCreateView" - >{{ footerCreateLabelTitle }}</gl-button + >{{ footerCreateLabelTitle }}</gl-deprecated-button > </li> <li> diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue index 57f7962dfe1..081c892e09f 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue @@ -1,10 +1,10 @@ <script> import { mapState, mapActions } from 'vuex'; -import { GlButton, GlLoadingIcon } from '@gitlab/ui'; +import { GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui'; export default { components: { - GlButton, + GlDeprecatedButton, GlLoadingIcon, }, props: { @@ -27,12 +27,12 @@ export default { {{ __('Labels') }} <template v-if="allowLabelEdit"> <gl-loading-icon v-show="labelsSelectInProgress" inline /> - <gl-button + <gl-deprecated-button variant="link" class="pull-right js-sidebar-dropdown-toggle" data-qa-selector="labels_edit_button" @click="toggleDropdownContents" - >{{ __('Edit') }}</gl-button + >{{ __('Edit') }}</gl-deprecated-button > </template> </div> |