Skip to content
Snippets Groups Projects
Commit fc798992 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'close-button-dialog' into 'master'

Add close button to dialogs

See merge request !384
parents f4335195 a66bcd12
No related branches found
No related tags found
1 merge request!384Add close button to dialogs
Pipeline #191699 failed
<template> <template>
<mobile-fullscreen-dialog v-model="popup" persistent> <mobile-fullscreen-dialog v-model="popup" persistent :close-button="false">
<template #activator="activator"> <template #activator="activator">
<fab-button <fab-button
color="secondary" color="secondary"
......
...@@ -3,6 +3,7 @@ import AbsenceReasonButtons from "aleksis.apps.kolego/components/AbsenceReasonBu ...@@ -3,6 +3,7 @@ import AbsenceReasonButtons from "aleksis.apps.kolego/components/AbsenceReasonBu
import AbsenceReasonChip from "aleksis.apps.kolego/components/AbsenceReasonChip.vue"; import AbsenceReasonChip from "aleksis.apps.kolego/components/AbsenceReasonChip.vue";
import AbsenceReasonGroupSelect from "aleksis.apps.kolego/components/AbsenceReasonGroupSelect.vue"; import AbsenceReasonGroupSelect from "aleksis.apps.kolego/components/AbsenceReasonGroupSelect.vue";
import CancelButton from "aleksis.core/components/generic/buttons/CancelButton.vue"; import CancelButton from "aleksis.core/components/generic/buttons/CancelButton.vue";
import DialogCloseButton from "aleksis.core/components/generic/buttons/DialogCloseButton.vue";
import MobileFullscreenDialog from "aleksis.core/components/generic/dialogs/MobileFullscreenDialog.vue"; import MobileFullscreenDialog from "aleksis.core/components/generic/dialogs/MobileFullscreenDialog.vue";
import mutateMixin from "aleksis.core/mixins/mutateMixin.js"; import mutateMixin from "aleksis.core/mixins/mutateMixin.js";
import deepSearchMixin from "aleksis.core/mixins/deepSearchMixin.js"; import deepSearchMixin from "aleksis.core/mixins/deepSearchMixin.js";
...@@ -30,6 +31,7 @@ export default { ...@@ -30,6 +31,7 @@ export default {
MobileFullscreenDialog, MobileFullscreenDialog,
SlideIterator, SlideIterator,
TardinessField, TardinessField,
DialogCloseButton,
}, },
mixins: [documentationPartMixin, mutateMixin, deepSearchMixin], mixins: [documentationPartMixin, mutateMixin, deepSearchMixin],
data() { data() {
...@@ -121,13 +123,17 @@ export default { ...@@ -121,13 +123,17 @@ export default {
v-bind="$attrs" v-bind="$attrs"
v-on="$listeners" v-on="$listeners"
v-model="dialog" v-model="dialog"
:close-button="false"
> >
<template #activator="activator"> <template #activator="activator">
<slot name="activator" v-bind="activator" /> <slot name="activator" v-bind="activator" />
</template> </template>
<template #title> <template #title>
<lesson-information v-bind="documentationPartProps" :compact="false" /> <div class="d-flex full-width">
<lesson-information v-bind="documentationPartProps" :compact="false" />
<dialog-close-button @click="dialog = false" class="ml-4" />
</div>
<v-scroll-x-transition leave-absolute> <v-scroll-x-transition leave-absolute>
<v-text-field <v-text-field
v-show="!isExpanded" v-show="!isExpanded"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment