From a33647f3744b788686fc9f18970a25683add7c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Tue, 28 Sep 2021 12:58:53 +0200 Subject: [PATCH] Improve price- and datestable layouts --- .../Assets/scss/components/_buttons.scss | 34 ++- .../Assets/scss/components/_tooltips.scss | 1 + .../Templates/AjaxTable/Datestable.html | 208 +++++++------- .../Templates/AjaxTable/Pricetable.html | 263 +++++++++--------- 4 files changed, 265 insertions(+), 241 deletions(-) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss index 528b7309..dc486b65 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss @@ -1,26 +1,34 @@ .button { @apply inline-flex items-center justify-center space-x-2 px-4 py-2 md:px-8; - @apply uppercase leading-none; + @apply uppercase leading-none text-center; @apply transition-colors outline-none focus:outline-none; - @apply bg-ep-secondary border-2 border-ep-secondary text-white; - @apply sbw:bg-sbw-secondary sbw:border-sbw-secondary; - @apply uch:bg-uch-secondary uch:border-uch-secondary; + @apply bg-ep-secondary text-white; + @apply sbw:bg-sbw-secondary; + @apply uch:bg-uch-secondary; + + &:hover { + @apply bg-ep-primary-dark; + @apply sbw:bg-sbw-primary-dark; + @apply uch:bg-uch-primary-dark; + } &--active, &--secondary { - @apply bg-ep-primary border-ep-primary; - @apply sbw:bg-sbw-primary sbw:border-sbw-primary; - @apply uch:bg-uch-primary uch:border-uch-primary; + @apply bg-ep-primary; + @apply sbw:bg-sbw-primary; + @apply uch:bg-uch-primary; } - &:hover { - @apply bg-ep-primary-dark border-ep-primary-dark; - @apply sbw:bg-sbw-primary-dark sbw:border-sbw-primary-dark; - @apply uch:bg-uch-primary-dark uch:border-uch-primary-dark; + &--muted { + @apply bg-gray-300; + + &:hover { + @apply bg-gray-300; + } } &--light { - @apply bg-white text-ep-primary border-2 border-ep-primary rounded; + @apply bg-white text-ep-primary border-2 border-ep-primary; @apply font-bold; &:hover, @@ -30,6 +38,6 @@ } &--small { - @apply px-2 py-1 md:px-4 text-xs border; + @apply px-2 py-1 md:px-4 text-xs sm:text-sm; } } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_tooltips.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_tooltips.scss index c253ab80..5899f9eb 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_tooltips.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_tooltips.scss @@ -3,4 +3,5 @@ :root { --cooltipz-bg-color: theme('colors.ep.secondary'); --cooltipz-text-color: theme('colors.white'); + --cooltipz-cursor: theme('cursor.default'); } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html index 28f42de8..917ebe54 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html @@ -42,80 +42,83 @@ -
- - - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - + - - - -
- Termin - - - - - - - - Preis ab - - inkl. -
- - -
+ Termin + + + + + + + + Preis ab + + inkl. +
+ + + +
+ -
- - - Buchen - -
- - - - {row.dateStart} - {row.dateEnd} - - - -
- {row.nights} - - - - {row.pseudoPrice} € + + Buchen + + + + + + {row.dateStart} - {row.dateEnd} - - - {row.minPrice} € + + ausgebucht + + + + + {row.nights} + + + + {row.pseudoPrice} € - - +
+ + + + + -
-
+ + + + + +
@@ -221,9 +231,9 @@