mirror
/
mobilizon
mirror of https://framagit.org/framasoft/mobilizon.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'mobilizon-fork-ui-input-border-box' into 'main' 

fix: create event time/date allignment

Closes #1336

See merge request framasoft/mobilizon!1426
This commit is contained in:
Thomas Citharel 2023-08-11 13:52:52 +00:00
parent 027013eba3 50695fcfd5
commit 6e7701b3c8
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/assets/oruga-tailwindcss.css
View File

@ -65,6 +65,9 @@ body {
.field-label { .field-label {
@apply block text-gray-700 dark:text-gray-100 text-base font-bold mb-2; @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 { .field-danger {
@apply text-red-500; @apply text-red-500;
} }
@ -86,7 +89,7 @@ body {
/* Input */ /* Input */
.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 { .input-danger {
@apply border-red-500; @apply border-red-500;
@ -193,7 +196,7 @@ body {
/* Select */ /* Select */
.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 */ /* Radio */

11
js/src/views/Event/EditView.vue
View File

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