Merge remote-tracking branch 'origin/main'

This commit is contained in:
778a69cd 2023-08-11 17:44:33 +02:00
commit 21e22e9514
2 changed files with 13 additions and 5 deletions

View file

@ -65,6 +65,9 @@ body {
.field-label {
@apply block text-gray-700 dark:text-gray-100 text-base font-bold mb-2;
}
.o-field__horizontal-label .field-label {
@apply mb-0;
}
.field-danger {
@apply text-red-500;
}
@ -86,7 +89,7 @@ body {
/* Input */
.input {
@apply appearance-none border w-full py-2 px-3 text-black leading-tight dark:bg-zinc-600 dark:placeholder:text-zinc-400 dark:text-zinc-50;
@apply appearance-none box-border border w-full py-2 px-3 text-black leading-tight dark:bg-zinc-600 dark:placeholder:text-zinc-400 dark:text-zinc-50;
}
.input-danger {
@apply border-red-500;
@ -193,7 +196,7 @@ body {
/* Select */
.select {
@apply dark:bg-zinc-600 dark:placeholder:text-zinc-400 dark:text-zinc-50 rounded pl-2 pr-8 border-2 border-transparent h-10 shadow-none border rounded;
@apply dark:bg-zinc-600 dark:placeholder:text-zinc-400 dark:text-zinc-50 rounded pl-2 pr-8 border-2 border-transparent h-10 shadow-none border rounded w-full;
}
/* Radio */

View file

@ -1,5 +1,5 @@
<template>
<div class="container mx-auto" v-if="hasCurrentActorPermissionsToEdit">
<div class="container mx-auto px-1" v-if="hasCurrentActorPermissionsToEdit">
<h1 class="" v-if="isUpdate === true">
{{ t("Update event {name}", { name: event.title }) }}
</h1>
@ -63,7 +63,7 @@
<o-field
horizontal
:label="t('Starts on…')"
class="begins-on-field"
class="items-center"
label-for="begins-on-field"
>
<o-datetimepicker
@ -85,7 +85,12 @@
</o-datetimepicker>
</o-field>
<o-field horizontal :label="t('Ends on…')" label-for="ends-on-field">
<o-field
horizontal
:label="t('Ends on…')"
label-for="ends-on-field"
class="items-center"
>
<o-datetimepicker
class="datepicker ends-on"
:placeholder="t('Type or select a date…')"