diff --git a/15-multi-step-form/src/main/resources/public/out.css b/15-multi-step-form/src/main/resources/public/out.css
index 4246de6..b8895df 100644
--- a/15-multi-step-form/src/main/resources/public/out.css
+++ b/15-multi-step-form/src/main/resources/public/out.css
@@ -572,44 +572,29 @@ video {
grid-row: span 2 / span 2;
}
+.row-span-full {
+ grid-row: 1 / -1;
+}
+
.row-start-1 {
grid-row-start: 1;
}
-.m-3 {
- margin: 0.75rem;
-}
-
-.my-7 {
- margin-top: 1.75rem;
- margin-bottom: 1.75rem;
-}
-
.my-3 {
margin-top: 0.75rem;
margin-bottom: 0.75rem;
}
-.mx-3 {
- margin-left: 0.75rem;
- margin-right: 0.75rem;
-}
-
-.mx-9 {
- margin-left: 2.25rem;
- margin-right: 2.25rem;
-}
-
-.my-4 {
- margin-top: 1rem;
- margin-bottom: 1rem;
-}
-
.my-5 {
margin-top: 1.25rem;
margin-bottom: 1.25rem;
}
+.my-7 {
+ margin-top: 1.75rem;
+ margin-bottom: 1.75rem;
+}
+
.-mt-20 {
margin-top: -5rem;
}
@@ -618,6 +603,14 @@ video {
margin-bottom: 0.5rem;
}
+.mb-4 {
+ margin-bottom: 1rem;
+}
+
+.ml-16 {
+ margin-left: 4rem;
+}
+
.ml-2 {
margin-left: 0.5rem;
}
@@ -638,42 +631,18 @@ video {
margin-right: 0.75rem;
}
-.mt-\[0\.3rem\] {
- margin-top: 0.3rem;
-}
-
.mt-3 {
margin-top: 0.75rem;
}
-.mb-4 {
- margin-bottom: 1rem;
-}
-
-.mt-2 {
- margin-top: 0.5rem;
-}
-
-.ml-16 {
- margin-left: 4rem;
-}
-
-.mb-10 {
- margin-bottom: 2.5rem;
-}
-
-.mb-3 {
- margin-bottom: 0.75rem;
-}
-
-.mt-4 {
- margin-top: 1rem;
-}
-
.mt-5 {
margin-top: 1.25rem;
}
+.mt-\[0\.3rem\] {
+ margin-top: 0.3rem;
+}
+
.flex {
display: flex;
}
@@ -702,6 +671,10 @@ video {
height: 3.5rem;
}
+.h-16 {
+ height: 4rem;
+}
+
.h-20 {
height: 5rem;
}
@@ -734,10 +707,6 @@ video {
height: 100vh;
}
-.h-16 {
- height: 4rem;
-}
-
.w-11\/12 {
width: 91.666667%;
}
@@ -792,6 +761,14 @@ video {
grid-template-columns: 1fr 100px;
}
+.grid-cols-\[1fr_70px\] {
+ grid-template-columns: 1fr 70px;
+}
+
+.grid-cols-\[1fr_auto\] {
+ grid-template-columns: 1fr auto;
+}
+
.grid-cols-\[auto_1fr\] {
grid-template-columns: auto 1fr;
}
@@ -800,16 +777,12 @@ video {
grid-template-columns: repeat(4, auto);
}
-.grid-cols-\[1fr_auto\] {
- grid-template-columns: 1fr auto;
+.grid-rows-5 {
+ grid-template-rows: repeat(5, minmax(0, 1fr));
}
-.grid-cols-\[1fr_50px\] {
- grid-template-columns: 1fr 50px;
-}
-
-.grid-cols-\[1fr_70px\] {
- grid-template-columns: 1fr 70px;
+.grid-rows-3 {
+ grid-template-rows: repeat(3, minmax(0, 1fr));
}
.flex-row {
@@ -832,12 +805,12 @@ video {
align-content: center;
}
-.items-center {
- align-items: center;
+.items-start {
+ align-items: flex-start;
}
-.justify-items-center {
- justify-items: center;
+.items-center {
+ align-items: center;
}
.gap-x-5 {
@@ -845,14 +818,14 @@ video {
column-gap: 1.25rem;
}
-.gap-y-4 {
- row-gap: 1rem;
-}
-
.gap-y-3 {
row-gap: 0.75rem;
}
+.gap-y-4 {
+ row-gap: 1rem;
+}
+
.divide-y > :not([hidden]) ~ :not([hidden]) {
--tw-divide-y-reverse: 0;
border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
@@ -896,14 +869,19 @@ video {
border-color: hsl(231 11% 63% / var(--tw-border-opacity));
}
+.border-light-gray {
+ --tw-border-opacity: 1;
+ border-color: hsl(229 24% 87% / var(--tw-border-opacity));
+}
+
.border-white {
--tw-border-opacity: 1;
border-color: rgb(255 255 255 / var(--tw-border-opacity));
}
-.border-light-gray {
- --tw-border-opacity: 1;
- border-color: hsl(229 24% 87% / var(--tw-border-opacity));
+.\!bg-light-blue {
+ --tw-bg-opacity: 1 !important;
+ background-color: hsl(206 94% 87% / var(--tw-bg-opacity)) !important;
}
.bg-green-200 {
@@ -911,11 +889,19 @@ video {
background-color: rgb(187 247 208 / var(--tw-bg-opacity));
}
+.bg-light-gray\/25 {
+ background-color: hsl(229 24% 87% / 0.25);
+}
+
.bg-magnolia {
--tw-bg-opacity: 1;
background-color: hsl(217 100% 97% / var(--tw-bg-opacity));
}
+.bg-magnolia\/75 {
+ background-color: hsl(217 100% 97% / 0.75);
+}
+
.bg-marine-blue {
--tw-bg-opacity: 1;
background-color: hsl(213 96% 18% / var(--tw-bg-opacity));
@@ -931,46 +917,10 @@ video {
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
}
-.\!bg-red-500 {
- --tw-bg-opacity: 1 !important;
- background-color: rgb(239 68 68 / var(--tw-bg-opacity)) !important;
-}
-
-.\!bg-white {
- --tw-bg-opacity: 1 !important;
- background-color: rgb(255 255 255 / var(--tw-bg-opacity)) !important;
-}
-
-.\!bg-light-blue {
- --tw-bg-opacity: 1 !important;
- background-color: hsl(206 94% 87% / var(--tw-bg-opacity)) !important;
-}
-
-.bg-light-gray {
- --tw-bg-opacity: 1;
- background-color: hsl(229 24% 87% / var(--tw-bg-opacity));
-}
-
-.bg-light-gray\/50 {
- background-color: hsl(229 24% 87% / 0.5);
-}
-
-.bg-light-gray\/25 {
- background-color: hsl(229 24% 87% / 0.25);
-}
-
-.bg-magnolia\/75 {
- background-color: hsl(217 100% 97% / 0.75);
-}
-
.bg-sidebar-mobile {
background-image: url("images/bg-sidebar-mobile.svg");
}
-.bg-auto {
- background-size: auto;
-}
-
.bg-cover {
background-size: cover;
}
@@ -991,10 +941,6 @@ video {
padding: 0.75rem;
}
-.p-4 {
- padding: 1rem;
-}
-
.px-4 {
padding-left: 1rem;
padding-right: 1rem;
@@ -1005,6 +951,11 @@ video {
padding-right: 1.5rem;
}
+.px-8 {
+ padding-left: 2rem;
+ padding-right: 2rem;
+}
+
.py-20 {
padding-top: 5rem;
padding-bottom: 5rem;
@@ -1025,19 +976,12 @@ video {
padding-bottom: 2rem;
}
-.px-3 {
- padding-left: 0.75rem;
- padding-right: 0.75rem;
+.pb-5 {
+ padding-bottom: 1.25rem;
}
-.py-32 {
- padding-top: 8rem;
- padding-bottom: 8rem;
-}
-
-.px-8 {
- padding-left: 2rem;
- padding-right: 2rem;
+.pl-5 {
+ padding-left: 1.25rem;
}
.pl-6 {
@@ -1048,18 +992,6 @@ video {
padding-top: 0.75rem;
}
-.pl-4 {
- padding-left: 1rem;
-}
-
-.pl-5 {
- padding-left: 1.25rem;
-}
-
-.pb-5 {
- padding-bottom: 1.25rem;
-}
-
.text-center {
text-align: center;
}
@@ -1096,6 +1028,11 @@ video {
text-transform: uppercase;
}
+.\!text-marine-blue {
+ --tw-text-opacity: 1 !important;
+ color: hsl(213 96% 18% / var(--tw-text-opacity)) !important;
+}
+
.text-cool-gray {
--tw-text-opacity: 1;
color: hsl(231 11% 63% / var(--tw-text-opacity));
@@ -1116,51 +1053,20 @@ video {
color: hsl(213 96% 18% / var(--tw-text-opacity));
}
-.text-white {
- --tw-text-opacity: 1;
- color: rgb(255 255 255 / var(--tw-text-opacity));
-}
-
-.\!text-marine-blue {
- --tw-text-opacity: 1 !important;
- color: hsl(213 96% 18% / var(--tw-text-opacity)) !important;
-}
-
.text-purplish-blue {
--tw-text-opacity: 1;
color: hsl(243 100% 62% / var(--tw-text-opacity));
}
-.text-magnolia {
+.text-white {
--tw-text-opacity: 1;
- color: hsl(217 100% 97% / var(--tw-text-opacity));
-}
-
-.text-alabaster {
- --tw-text-opacity: 1;
- color: hsl(231 100% 99% / var(--tw-text-opacity));
+ color: rgb(255 255 255 / var(--tw-text-opacity));
}
.underline {
text-decoration-line: underline;
}
-.accent-green-500 {
- accent-color: #22c55e;
-}
-
-.accent-marine-blue {
- accent-color: hsl(213, 96%, 18%);
-}
-
-.accent-pastel-blue {
- accent-color: hsl(228, 100%, 84%);
-}
-
-.accent-light-blue {
- accent-color: hsl(206, 94%, 87%);
-}
-
.accent-purplish-blue {
accent-color: hsl(243, 100%, 62%);
}
@@ -1284,16 +1190,6 @@ html {
transition-duration: 150ms;
}
-.checked\:bg-marine-blue:checked {
- --tw-bg-opacity: 1;
- background-color: hsl(213 96% 18% / var(--tw-bg-opacity));
-}
-
-.checked\:bg-blue-500:checked {
- --tw-bg-opacity: 1;
- background-color: rgb(59 130 246 / var(--tw-bg-opacity));
-}
-
.checked\:after\:ml-\[1\.2rem\]:checked::after {
content: var(--tw-content);
margin-left: 1.2rem;
@@ -1304,16 +1200,6 @@ html {
border-color: hsl(354 84% 57% / var(--tw-border-opacity));
}
-.invalid\:border-red-500:invalid {
- --tw-border-opacity: 1;
- border-color: rgb(239 68 68 / var(--tw-border-opacity));
-}
-
-.invalid\:border-green-500:invalid {
- --tw-border-opacity: 1;
- border-color: rgb(34 197 94 / var(--tw-border-opacity));
-}
-
.hover\:cursor-pointer:hover {
cursor: pointer;
}
@@ -1323,38 +1209,10 @@ html {
border-color: hsl(243 100% 62% / var(--tw-border-opacity));
}
-.hover\:border-green-700:hover {
- --tw-border-opacity: 1;
- border-color: rgb(21 128 61 / var(--tw-border-opacity));
-}
-
-.hover\:border-red-700:hover {
- --tw-border-opacity: 1;
- border-color: rgb(185 28 28 / var(--tw-border-opacity));
-}
-
-.hover\:bg-magnolia\/25:hover {
- background-color: hsl(217 100% 97% / 0.25);
-}
-
-.hover\:bg-magnolia\/\[10\]:hover {
- background-color: hsl(217 100% 97% / 10);
-}
-
.hover\:bg-magnolia\/\[\.1\]:hover {
background-color: hsl(217 100% 97% / .1);
}
-.hover\:bg-red-700:hover {
- --tw-bg-opacity: 1;
- background-color: rgb(185 28 28 / var(--tw-bg-opacity));
-}
-
-.focus\:border-green-500:focus {
- --tw-border-opacity: 1;
- border-color: rgb(34 197 94 / var(--tw-border-opacity));
-}
-
.focus\:border-marine-blue:focus {
--tw-border-opacity: 1;
border-color: hsl(213 96% 18% / var(--tw-border-opacity));
@@ -1365,24 +1223,6 @@ html {
outline-offset: 2px;
}
-.focus\:outline-marine-blue:focus {
- outline-color: hsl(213, 96%, 18%);
-}
-
-.focus\:outline-green-500:focus {
- outline-color: #22c55e;
-}
-
-.active\:border-red-500:active {
- --tw-border-opacity: 1;
- border-color: rgb(239 68 68 / var(--tw-border-opacity));
-}
-
-.active\:bg-red-500:active {
- --tw-bg-opacity: 1;
- background-color: rgb(239 68 68 / var(--tw-bg-opacity));
-}
-
.peer:checked ~ .peer-checked\:border-purplish-blue {
--tw-border-opacity: 1;
border-color: hsl(243 100% 62% / var(--tw-border-opacity));
@@ -1401,14 +1241,6 @@ html {
background-color: hsl(217 100% 97% / 0.75);
}
-.peer:checked ~ .peer-checked\:bg-magnolia\/25 {
- background-color: hsl(217 100% 97% / 0.25);
-}
-
-.peer:checked ~ .peer-checked\:bg-magnolia\/\[\.1\] {
- background-color: hsl(217 100% 97% / .1);
-}
-
.peer:checked ~ .peer-checked\:text-cool-gray {
--tw-text-opacity: 1;
color: hsl(231 11% 63% / var(--tw-text-opacity));
@@ -1420,17 +1252,12 @@ html {
}
@media (min-width: 768px) {
- .md\:row-span-2 {
- grid-row: span 2 / span 2;
- }
-
.md\:row-span-1 {
grid-row: span 1 / span 1;
}
- .md\:mx-10 {
- margin-left: 2.5rem;
- margin-right: 2.5rem;
+ .md\:row-span-2 {
+ grid-row: span 2 / span 2;
}
.md\:mx-4 {
@@ -1438,18 +1265,13 @@ html {
margin-right: 1rem;
}
- .md\:my-10 {
- margin-top: 2.5rem;
- margin-bottom: 2.5rem;
- }
-
.md\:my-7 {
margin-top: 1.75rem;
margin-bottom: 1.75rem;
}
- .md\:ml-20 {
- margin-left: 5rem;
+ .md\:ml-24 {
+ margin-left: 6rem;
}
.md\:mr-24 {
@@ -1460,30 +1282,14 @@ html {
margin-top: 0px;
}
- .md\:ml-8 {
- margin-left: 2rem;
- }
-
- .md\:ml-10 {
- margin-left: 2.5rem;
- }
-
- .md\:ml-24 {
- margin-left: 6rem;
+ .md\:mt-2 {
+ margin-top: 0.5rem;
}
.md\:mt-5 {
margin-top: 1.25rem;
}
- .md\:mt-4 {
- margin-top: 1rem;
- }
-
- .md\:mt-2 {
- margin-top: 0.5rem;
- }
-
.md\:flex {
display: flex;
}
@@ -1500,6 +1306,14 @@ html {
height: 3rem;
}
+ .md\:h-20 {
+ height: 5rem;
+ }
+
+ .md\:h-40 {
+ height: 10rem;
+ }
+
.md\:h-\[568px\] {
height: 568px;
}
@@ -1512,28 +1326,8 @@ html {
height: 100%;
}
- .md\:h-32 {
- height: 8rem;
- }
-
- .md\:h-40 {
- height: 10rem;
- }
-
- .md\:h-10 {
- height: 2.5rem;
- }
-
- .md\:h-16 {
- height: 4rem;
- }
-
- .md\:h-20 {
- height: 5rem;
- }
-
- .md\:h-24 {
- height: 6rem;
+ .md\:w-20 {
+ width: 5rem;
}
.md\:w-32 {
@@ -1552,10 +1346,6 @@ html {
width: 100%;
}
- .md\:w-20 {
- width: 5rem;
- }
-
.md\:grow {
flex-grow: 1;
}
@@ -1568,14 +1358,14 @@ html {
grid-template-columns: auto 1fr;
}
- .md\:grid-rows-\[repeat\(4\2c _auto\)\] {
- grid-template-rows: repeat(4, auto);
- }
-
.md\:grid-rows-\[1fr_auto_auto\] {
grid-template-rows: 1fr auto auto;
}
+ .md\:grid-rows-\[repeat\(4\2c _auto\)\] {
+ grid-template-rows: repeat(4, auto);
+ }
+
.md\:flex-row {
flex-direction: row;
}
@@ -1600,10 +1390,6 @@ html {
justify-content: center;
}
- .md\:justify-between {
- justify-content: space-between;
- }
-
.md\:gap-x-4 {
-moz-column-gap: 1rem;
column-gap: 1rem;
@@ -1613,10 +1399,6 @@ html {
row-gap: 1.75rem;
}
- .md\:gap-y-4 {
- row-gap: 1rem;
- }
-
.md\:place-self-start {
place-self: start;
}
@@ -1642,6 +1424,10 @@ html {
padding: 2.5rem;
}
+ .md\:p-4 {
+ padding: 1rem;
+ }
+
.md\:p-5 {
padding: 1.25rem;
}
@@ -1650,8 +1436,9 @@ html {
padding: 1.5rem;
}
- .md\:p-4 {
- padding: 1rem;
+ .md\:px-0 {
+ padding-left: 0px;
+ padding-right: 0px;
}
.md\:px-24 {
@@ -1664,21 +1451,15 @@ html {
padding-right: 1rem;
}
- .md\:py-4 {
- padding-top: 1rem;
- padding-bottom: 1rem;
- }
-
- .md\:px-0 {
- padding-left: 0px;
- padding-right: 0px;
- }
-
.md\:px-6 {
padding-left: 1.5rem;
padding-right: 1.5rem;
}
+ .md\:pb-10 {
+ padding-bottom: 2.5rem;
+ }
+
.md\:pb-2 {
padding-bottom: 0.5rem;
}
@@ -1687,18 +1468,14 @@ html {
padding-bottom: 0.75rem;
}
- .md\:pt-5 {
- padding-top: 1.25rem;
- }
-
- .md\:pb-10 {
- padding-bottom: 2.5rem;
- }
-
.md\:pb-8 {
padding-bottom: 2rem;
}
+ .md\:pt-5 {
+ padding-top: 1.25rem;
+ }
+
.md\:text-4xl {
font-size: 2.25rem;
line-height: 2.5rem;
@@ -1709,21 +1486,6 @@ html {
line-height: 1.5rem;
}
- .md\:text-2xl {
- font-size: 1.5rem;
- line-height: 2rem;
- }
-
- .md\:text-6xl {
- font-size: 3.75rem;
- line-height: 1;
- }
-
- .md\:text-3xl {
- font-size: 1.875rem;
- line-height: 2.25rem;
- }
-
.md\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
@@ -1733,14 +1495,6 @@ html {
letter-spacing: 0.1em;
}
- .md\:tracking-wide {
- letter-spacing: 0.025em;
- }
-
- .md\:tracking-\[0rem\] {
- letter-spacing: 0rem;
- }
-
.md\:drop-shadow-2xl {
--tw-drop-shadow: drop-shadow(0 25px 25px rgb(0 0 0 / 0.15));
filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
diff --git a/15-multi-step-form/src/main/resources/templates/step2.html b/15-multi-step-form/src/main/resources/templates/step2.html
index 8ec0c86..7e78506 100644
--- a/15-multi-step-form/src/main/resources/templates/step2.html
+++ b/15-multi-step-form/src/main/resources/templates/step2.html
@@ -136,18 +136,20 @@
class="grid absolute inset-y-0 inset-x-0 place-content-center h-full rounded-lg border md:grid-cols-1 md:p-4 grid-cols-[auto_1fr] border-light-gray peer-checked:border-purplish-blue peer-checked:bg-magnolia/50 md:grid-rows-[1fr_auto_auto] hover:bg-magnolia/[.1] hover:border-purplish-blue"
>
-
- $90/yr -
-- 2 months free -
++ $9/mo +
++ 2 months free +
+