diff options
Diffstat (limited to 'app/assets/javascripts')
10 files changed, 25 insertions, 10 deletions
diff --git a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue index 3fbe8fe1be7..dc07eaf7f59 100644 --- a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue +++ b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue @@ -27,7 +27,12 @@ export default { </script> <template> <div class="dropdown inline"> - <button class="dropdown-menu-toggle" type="button" data-toggle="dropdown" aria-expanded="false"> + <button + class="btn btn-default dropdown-menu-toggle" + type="button" + data-toggle="dropdown" + aria-expanded="false" + > <span :style="{ backgroundColor: selected.label.color }" class="dropdown-label-box"> </span> {{ selected.title }} <icon name="chevron-down" /> </button> diff --git a/app/assets/javascripts/boards/components/project_select.vue b/app/assets/javascripts/boards/components/project_select.vue index a1cf1866faf..d193b75d217 100644 --- a/app/assets/javascripts/boards/components/project_select.vue +++ b/app/assets/javascripts/boards/components/project_select.vue @@ -85,7 +85,7 @@ export default { <label class="label-bold prepend-top-10">{{ __('Project') }}</label> <div ref="projectsDropdown" class="dropdown dropdown-projects"> <button - class="dropdown-menu-toggle wide" + class="btn btn-default dropdown-menu-toggle wide" type="button" data-toggle="dropdown" aria-expanded="false" diff --git a/app/assets/javascripts/ide/components/file_templates/bar.vue b/app/assets/javascripts/ide/components/file_templates/bar.vue index d459e3b43d3..ec71c10ce14 100644 --- a/app/assets/javascripts/ide/components/file_templates/bar.vue +++ b/app/assets/javascripts/ide/components/file_templates/bar.vue @@ -65,7 +65,12 @@ export default { @click="selectTemplate" /> <transition name="fade"> - <button v-show="updateSuccess" type="button" class="btn btn-default" @click="undo"> + <button + v-show="updateSuccess" + type="button" + class="js-undo-btn btn btn-default" + @click="undo" + > {{ __('Undo') }} </button> </transition> diff --git a/app/assets/javascripts/issue_show/components/fields/description_template.vue b/app/assets/javascripts/issue_show/components/fields/description_template.vue index 6f955928d8e..ac950b455f8 100644 --- a/app/assets/javascripts/issue_show/components/fields/description_template.vue +++ b/app/assets/javascripts/issue_show/components/fields/description_template.vue @@ -50,7 +50,7 @@ export default { :data-namespace-path="projectNamespace" :data-project-path="projectPath" :data-data="issuableTemplatesJson" - class="dropdown-menu-toggle js-issuable-selector" + class="btn btn-default dropdown-menu-toggle js-issuable-selector" type="button" data-field-name="issuable_template" data-selected="null" diff --git a/app/assets/javascripts/jobs/components/stages_dropdown.vue b/app/assets/javascripts/jobs/components/stages_dropdown.vue index 6e92b599b0a..89160891cad 100644 --- a/app/assets/javascripts/jobs/components/stages_dropdown.vue +++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue @@ -83,7 +83,7 @@ export default { <button type="button" data-toggle="dropdown" - class="js-selected-stage dropdown-menu-toggle prepend-top-8" + class="js-selected-stage btn btn-default dropdown-menu-toggle prepend-top-8" > {{ selectedStage }} <i class="fa fa-chevron-down"></i> </button> diff --git a/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue b/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue index ebd7a17040a..1679654a421 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue @@ -65,7 +65,7 @@ export default { type="button" data-toggle="dropdown" data-display="static" - class="dropdown-menu-toggle build-content" + class="btn btn-default dropdown-menu-toggle build-content" > <ci-icon :status="group.status" /> diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue b/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue index 0e8b6d93f42..a82e9c8edf6 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue @@ -23,5 +23,5 @@ export default { </script> <template> - <button type="button" class="btn menu-item" @click="openModal">{{ buttonText }}</button> + <button type="button" class="menu-item" @click="openModal">{{ buttonText }}</button> </template> diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue index 22f370c4bca..5c36a06561a 100644 --- a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue @@ -29,7 +29,7 @@ export default { <template> <button :disabled="isDisabled || isLoading" - class="dropdown-menu-toggle dropdown-menu-full-width" + class="btn btn-default dropdown-menu-toggle dropdown-menu-full-width btn" type="button" data-toggle="dropdown" aria-expanded="false" diff --git a/app/assets/javascripts/vue_shared/components/pikaday.vue b/app/assets/javascripts/vue_shared/components/pikaday.vue index 8104d919bf6..ff781a5a69d 100644 --- a/app/assets/javascripts/vue_shared/components/pikaday.vue +++ b/app/assets/javascripts/vue_shared/components/pikaday.vue @@ -64,7 +64,12 @@ export default { <template> <div class="pikaday-container"> <div class="dropdown open"> - <button type="button" class="dropdown-menu-toggle" data-toggle="dropdown" @click="toggled"> + <button + type="button" + class="btn btn-default dropdown-menu-toggle" + data-toggle="dropdown" + @click="toggled" + > <span class="dropdown-toggle-text"> {{ label }} </span> <i class="fa fa-chevron-down" aria-hidden="true"> </i> </button> diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue index 1eed8907bb7..f874da3e60b 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue @@ -74,7 +74,7 @@ export default { :data-scoped-labels="enableScopedLabels" :data-scoped-labels-documentation-link="scopedLabelsDocumentationLink" type="button" - class="dropdown-menu-toggle wide js-label-select js-multiselect js-context-config-modal" + class="btn btn-default dropdown-menu-toggle wide js-label-select js-multiselect js-context-config-modal" data-toggle="dropdown" > <span class="dropdown-toggle-text"> {{ dropdownToggleText }} </span> |