Commit 0413042e authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '229345-issueboards-modal-header' into 'master'

Migrate Bootstrap button to GlButton in boards modal

Closes #229345

See merge request gitlab-org/gitlab!40633
parents c65ced47 4fffba15
<script> <script>
/* eslint-disable @gitlab/vue-require-i18n-strings */ /* eslint-disable @gitlab/vue-require-i18n-strings */
import { GlButton } from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
import ModalFilters from './filters'; import ModalFilters from './filters';
import ModalTabs from './tabs.vue'; import ModalTabs from './tabs.vue';
...@@ -10,6 +11,7 @@ export default { ...@@ -10,6 +11,7 @@ export default {
components: { components: {
ModalTabs, ModalTabs,
ModalFilters, ModalFilters,
GlButton,
}, },
mixins: [modalMixin], mixins: [modalMixin],
props: { props: {
...@@ -39,7 +41,7 @@ export default { ...@@ -39,7 +41,7 @@ export default {
}, },
methods: { methods: {
toggleAll() { toggleAll() {
this.$refs.selectAllBtn.blur(); this.$refs.selectAllBtn.$el.blur();
ModalStore.toggleAll(); ModalStore.toggleAll();
}, },
...@@ -51,28 +53,28 @@ export default { ...@@ -51,28 +53,28 @@ export default {
<header class="add-issues-header border-top-0 form-actions"> <header class="add-issues-header border-top-0 form-actions">
<h2 class="m-0"> <h2 class="m-0">
Add issues Add issues
<button <gl-button
type="button" category="tertiary"
icon="close"
class="close" class="close"
data-dismiss="modal" data-dismiss="modal"
:aria-label="__('Close')" :aria-label="__('Close')"
@click="toggleModal(false)" @click="toggleModal(false)"
> />
<span aria-hidden="true">×</span>
</button>
</h2> </h2>
</header> </header>
<modal-tabs v-if="!loading && issuesCount > 0" /> <modal-tabs v-if="!loading && issuesCount > 0" />
<div v-if="showSearch" class="d-flex gl-mb-3"> <div v-if="showSearch" class="d-flex gl-mb-3">
<modal-filters :store="filter" /> <modal-filters :store="filter" />
<button <gl-button
ref="selectAllBtn" ref="selectAllBtn"
type="button" category="secondary"
class="btn btn-success btn-inverted gl-ml-3" variant="success"
class="gl-ml-3"
@click="toggleAll" @click="toggleAll"
> >
{{ selectAllText }} {{ selectAllText }}
</button> </gl-button>
</div> </div>
</div> </div>
</template> </template>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment