From 0748f8e0bbc88ae597b0a15f94b6bae0a722b1b8 Mon Sep 17 00:00:00 2001 From: Benjamin Seber Date: Fri, 29 Dec 2023 11:44:46 +0100 Subject: [PATCH 01/25] fix duet-date-picker filling invisible height --- src/main/css/2-components.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/css/2-components.css b/src/main/css/2-components.css index 739bc73d2..66ff9f057 100644 --- a/src/main/css/2-components.css +++ b/src/main/css/2-components.css @@ -20,6 +20,17 @@ margin-top: auto; } +duet-date-picker .duet-date__dialog { + /* completely "hide" the div to avoid adding height to the parent element. */ + height: 0; + overflow: hidden; +} + +duet-date-picker .duet-date__dialog.is-active { + height: auto; + overflow: auto; +} + duet-date-picker.edited ~ label > span { color: theme("colors.blue.600"); } From 983e17bfb46130e56aa9671f1cdfe57f66d499a4 Mon Sep 17 00:00:00 2001 From: Benjamin Seber Date: Fri, 29 Dec 2023 12:07:17 +0100 Subject: [PATCH 02/25] WIP move navigation to the left side --- src/main/css/1-base.css | 7 + src/main/css/components/navigation.css | 15 +- src/main/resources/templates/_layout.html | 21 +- src/main/resources/templates/_navigation.html | 190 +++++++++--------- 4 files changed, 119 insertions(+), 114 deletions(-) diff --git a/src/main/css/1-base.css b/src/main/css/1-base.css index b963f79bc..ac5683f76 100644 --- a/src/main/css/1-base.css +++ b/src/main/css/1-base.css @@ -25,6 +25,13 @@ body { min-height: --webkit-fill-available; background-image: linear-gradient(#ffffff, #fafafa); background-attachment: fixed; + + display: grid; + grid-template-rows: auto 1fr; + grid-template-columns: auto 1fr; + grid-template-areas: + "banner banner" + "navigation content"; } input:not([class*="rounded"]), diff --git a/src/main/css/components/navigation.css b/src/main/css/components/navigation.css index 361ca749b..c277ed516 100644 --- a/src/main/css/components/navigation.css +++ b/src/main/css/components/navigation.css @@ -1,9 +1,9 @@ #menu-toggle-checkbox ~ label ~ nav { - position: fixed; - top: 100%; - bottom: 0; - left: 0; - right: 0; + /*position: fixed;*/ + /*top: 100%;*/ + /*bottom: 0;*/ + /*left: 0;*/ + /*right: 0;*/ @apply px-6; @apply py-8; @apply transition-all; @@ -133,7 +133,7 @@ max-height: 0; top: -100%; @apply bg-zinc-100; - z-index: 10; + /*z-index: 10;*/ } #menu-toggle-checkbox:checked ~ label ~ nav, @@ -168,8 +168,7 @@ @apply lg:w-5; @apply lg:h-5; @apply lg:stroke-gray-800; - @apply mr-4; - @apply lg:mr-1.5; + @apply mr-3.5; } .main-nav-link:hover svg { @apply fill-amber-500; diff --git a/src/main/resources/templates/_layout.html b/src/main/resources/templates/_layout.html index aadc2ef48..31af3a7aa 100644 --- a/src/main/resources/templates/_layout.html +++ b/src/main/resources/templates/_layout.html @@ -95,20 +95,23 @@ - - + +
+
+
-
- +
+ +
-
+
+
content block
+
footer block
-
footer block
-
diff --git a/src/main/resources/templates/_navigation.html b/src/main/resources/templates/_navigation.html index f0093d3e0..9c38fa183 100644 --- a/src/main/resources/templates/_navigation.html +++ b/src/main/resources/templates/_navigation.html @@ -6,21 +6,104 @@ -
-
-
-