Skip to content
Snippets Groups Projects
Commit 918a1ffa authored by Konrad Mohrfeldt's avatar Konrad Mohrfeldt :koala:
Browse files

fix: don’t let calendar overflow page in conflict mode

parent 50466f64
No related branches found
No related tags found
No related merge requests found
......@@ -17,8 +17,12 @@
</div>
</template>
<auth-wall v-else-if="selectedShow" class="tw-flex-1">
<b-alert :variant="conflictCount > 0 ? 'danger' : 'success'" :show="conflictMode">
<auth-wall v-else-if="selectedShow" class="tw-flex-1 tw-flex tw-flex-col">
<b-alert
class="tw-flex-none"
:variant="conflictCount > 0 ? 'danger' : 'success'"
:show="conflictMode"
>
<div v-if="conflictMode">
<h4>{{ $t('conflictResolution.title') }}</h4>
<p
......@@ -74,9 +78,9 @@
</div>
</b-alert>
<server-errors :errors="serverErrors" />
<server-errors class="tw-flex-none" :errors="serverErrors" />
<div class="tw-h-full">
<div class="tw-flex-1 tw-basis-full">
<KeepAlive>
<div v-if="view === 'week'" class="tw-h-full">
<FullCalendar ref="calendar" :options="calendarConfig" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment