fixed color on event days

AOEpeople · Jan 18, 2024 · 5985e38 · 5985e38
1 parent ec8cedd
commit 5985e38
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Resources/src/components/dashboard/Day.vue b/src/Resources/src/components/dashboard/Day.vue
@@ -1,8 +1,9 @@
 <template>
-  <div class="day-shadow mx-auto grid h-auto max-w-[414px] grid-cols-[auto_minmax(0,1fr)] grid-rows-[minmax(0,1fr)_auto] rounded bg-white sm:max-w-none">
+  <div class="day-shadow mx-auto grid h-auto min-h-[153px] max-w-[414px] grid-cols-[auto_minmax(0,1fr)] grid-rows-[minmax(0,1fr)_auto] rounded bg-white sm:max-w-none">
     <div
       class="relative col-span-1 col-start-1 row-span-2 row-start-1 grid w-[24px] justify-center gap-2 rounded-l-[5px] py-[2px]"
-      :class="[(day.isLocked || !day.isEnabled || emptyDay) && !isEventDay ? 'bg-[#80909F]' : 'bg-primary-2', !day.isLocked && !emptyDay && !guestData ? 'grid-rows-[minmax(0,1fr)_24px]' : '']"
+      :class="[day.isLocked || !day.isEnabled || (emptyDay && !isEventDay) ? 'bg-[#80909F]' : 'bg-primary-2',
+               !day.isLocked && !emptyDay && !guestData ? 'grid-rows-[minmax(0,1fr)_24px]' : '']"
     >
       <span
         class="row-start-1 rotate-180 place-self-center text-center text-[11px] font-bold uppercase leading-4 tracking-[3px] text-white [writing-mode:vertical-lr]"
@@ -37,7 +38,7 @@
         v-for="(meal, mealID) in day.meals"
         :key="mealID"
         class="mx-[15px] border-b-[0.7px] last:border-b-0"
-        :class="day.event !== null ? 'pt-[13px] pb-[13px] last:pb-0 last:pt-[21px]' : 'py-[13px]'"
+        :class="isEventDay ? 'pt-[13px] pb-[13px] last:pb-0 last:pt-[21px]' : 'py-[13px]'"
       >
         <VariationsData
           v-if="meal.variations"
@@ -60,11 +61,14 @@
     <div
       v-if="emptyDay || !day.isEnabled"
       class="z-[1] col-start-2 row-start-1 grid h-full min-w-[290px] items-center"
+      :class="isEventDay ? 'pt-[24px]' : ''"
     >
-      <span class="description relative ml-[23px] text-primary-1">{{ t('dashboard.no_service') }}</span>
+      <span class="description relative ml-[15px] text-primary-1">
+        {{ t('dashboard.no_service') }}
+      </span>
     </div>
     <EventData
-      v-if="day.event !== null"
+      v-if="isEventDay"
       class="col-start-2 row-start-2"
       :day="day"
     />