From 1d712d4bca77e319368144339f8489215916bce5 Mon Sep 17 00:00:00 2001 From: Julian Leucker <leuckerj@gmail.com> Date: Fri, 15 Mar 2024 21:20:49 +0100 Subject: [PATCH] Fix positioning of lesson-* elements in documentation --- .../coursebook/documentation/Documentation.vue | 15 +++++++++++---- .../documentation/LessonInformation.vue | 4 ++-- .../coursebook/documentation/LessonNotes.vue | 4 ++-- .../coursebook/documentation/LessonSummary.vue | 6 +++--- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue index 8da2be10f..d19068f53 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue @@ -6,13 +6,13 @@ <!-- flex-md-row zeile ab medium --> <!-- align-stretch - stretch full-width --> - <div + <v-card-text class="full-width d-flex flex-column align-stretch" :class="{ 'flex-md-row': compact }" > <lesson-information v-if="compact" class="flex-110" v-bind="documentationPartProps" /> <lesson-summary - class="flex-grow-1" + :class="{ 'flex-110': compact }" ref="summary" v-bind="{ ...$attrs, ...documentationPartProps }" :is-create="false" @@ -21,8 +21,8 @@ @loading="loading = $event" @save="$emit('close')" /> - <lesson-notes class="flex-grow-1" v-bind="documentationPartProps" /> - </div> + <lesson-notes :class="{ 'flex-110': compact }" v-bind="documentationPartProps" /> + </v-card-text> <v-divider /> <v-card-actions v-if="!compact"> <v-spacer /> @@ -69,3 +69,10 @@ export default { }, }; </script> + +<style scoped> +.flex-110 { + flex: 1 1 0; + width: 0; +} +</style> diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue index 7f2d5c36a..77aa69b98 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue @@ -1,5 +1,5 @@ <template> - <v-card-text class="d-flex align-center flex-wrap gap"> + <div class="full-width d-flex align-center flex-wrap gap justify-space-around"> <div> <time :datetime="documentation.datetimeStart" :class="{ 'd-block': compact }"> {{ $d(toDateTime(documentation.datetimeStart), "shortTime") }} @@ -16,7 +16,7 @@ class="ms-2" :append-icon="documentation.canEdit ? '$edit' : undefined" /> - </v-card-text> + </div> </template> <script> diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue index 24bc9b8ff..adb7b88c7 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue @@ -1,5 +1,5 @@ <template> - <v-card-text + <div class="d-flex align-center justify-space-between justify-md-end flex-wrap gap" > <v-chip dense color="success"> @@ -26,7 +26,7 @@ > Hausaufgaben vergessen </v-chip> - </v-card-text> + </div> </template> <script> diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonSummary.vue b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonSummary.vue index b0af7a8f6..79df3e594 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonSummary.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonSummary.vue @@ -1,5 +1,5 @@ <template> - <v-card-text> + <div> <!-- compact --> <div class="d-flex flex-column flex-md-row align-stretch align-md-center gap justify-start" @@ -18,7 +18,7 @@ :loading="loading" :disabled="!documentation.canEdit" /> - <div class="d-flex flex-column align-start"> + <div class="d-flex flex-column align-start flex-grow-1"> <v-chip v-bind="dialogActivator.attrs" v-on="dialogActivator.on" @@ -81,7 +81,7 @@ @input="groupNote = $event" :disabled="!documentation.canEdit" /> - </v-card-text> + </div> </template> <script> -- GitLab