diff --git a/assets/css/theme.css b/assets/css/theme.css index c2abd4f..9b0f967 100644 --- a/assets/css/theme.css +++ b/assets/css/theme.css @@ -949,6 +949,10 @@ select { margin-top: 2rem; } +.ml-auto { + margin-left: auto; +} + .block { display: block; } @@ -1223,6 +1227,10 @@ select { margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse))); } +.justify-self-end { + justify-self: end; +} + .overflow-y-auto { overflow-y: auto; } @@ -1348,6 +1356,11 @@ select { background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } +.bg-red-200 { + --tw-bg-opacity: 1; + background-color: rgb(254 202 202 / var(--tw-bg-opacity)); +} + .stroke-gray-500 { stroke: #6b7280; } @@ -1360,6 +1373,18 @@ select { stroke: inherit; } +.stroke-gray-700 { + stroke: #374151; +} + +.stroke-gray-400 { + stroke: #9ca3af; +} + +.stroke-black { + stroke: #000; +} + .stroke-\[3px\] { stroke-width: 3px; } @@ -1390,6 +1415,14 @@ select { padding: 2rem; } +.p-3 { + padding: 0.75rem; +} + +.p-2\.5 { + padding: 0.625rem; +} + .px-2 { padding-left: 0.5rem; padding-right: 0.5rem; @@ -1607,6 +1640,16 @@ select { color: rgb(255 255 255 / var(--tw-text-opacity)); } +.text-gray-500 { + --tw-text-opacity: 1; + color: rgb(107 114 128 / var(--tw-text-opacity)); +} + +.text-gray-300 { + --tw-text-opacity: 1; + color: rgb(209 213 219 / var(--tw-text-opacity)); +} + .line-through { text-decoration-line: line-through; } @@ -1762,16 +1805,6 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { color: rgb(209 213 219 / var(--tw-text-opacity)); } -.disabled\:text-gray-500:disabled { - --tw-text-opacity: 1; - color: rgb(107 114 128 / var(--tw-text-opacity)); -} - -.disabled\:text-gray-400:disabled { - --tw-text-opacity: 1; - color: rgb(156 163 175 / var(--tw-text-opacity)); -} - .group:hover .group-hover\:flex { display: flex; } @@ -1781,6 +1814,22 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { color: rgb(30 58 138 / var(--tw-text-opacity)); } +.group.-current .group-\[\.-current\]\:block { + display: block; +} + +.group.-complete .group-\[\.-complete\]\:block { + display: block; +} + +.group.-complete .group-\[\.-complete\]\:hidden { + display: none; +} + +.group.-current .group-\[\.-current\]\:hidden { + display: none; +} + @media not all and (min-width: 1024px) { .max-lg\:flex-col { flex-direction: column; @@ -2057,3 +2106,27 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { line-height: 1; } } + +.\[\&\>\.content\\\]\:block>.content\undefined { + display: block; +} + +.\[\&\>\.content\\\]\:hidden>.content\undefined { + display: none; +} + +.\[\&\>\.content\]\:block>.content { + display: block; +} + +.\[\&\>\.content\]\:hidden>.content { + display: none; +} + +.\[\&\>div\\\]\:block>div\undefined { + display: block; +} + +.\[\&\>p\\\]\:block>p\undefined { + display: block; +} diff --git a/templates/checkout/_partials/steps/addresses.tpl b/templates/checkout/_partials/steps/addresses.tpl index 5699d15..36a8bee 100644 --- a/templates/checkout/_partials/steps/addresses.tpl +++ b/templates/checkout/_partials/steps/addresses.tpl @@ -25,7 +25,6 @@ {extends file='checkout/_partials/steps/checkout-step.tpl'} {block name='step_content'} - {if !$step_is_complete}
- {/if} {/block} diff --git a/templates/checkout/_partials/steps/checkout-step.tpl b/templates/checkout/_partials/steps/checkout-step.tpl index b02f911..80763dd 100644 --- a/templates/checkout/_partials/steps/checkout-step.tpl +++ b/templates/checkout/_partials/steps/checkout-step.tpl @@ -30,15 +30,19 @@ '-reachable' => $step_is_reachable, '-complete' => $step_is_complete, 'js-current-step' => $step_is_current - ]|classnames}" + ]|classnames} group" > -
- +
+ + {$position} {$title} + + +
-
+ diff --git a/templates/checkout/_partials/steps/payment.tpl b/templates/checkout/_partials/steps/payment.tpl index 81c9cde..2b2fca7 100644 --- a/templates/checkout/_partials/steps/payment.tpl +++ b/templates/checkout/_partials/steps/payment.tpl @@ -1,7 +1,6 @@ {extends file='checkout/_partials/steps/checkout-step.tpl'} {block name='step_content'} - {if !$step_is_complete}
{hook h='displayPaymentTop'} @@ -161,6 +160,5 @@
- {/if} {/block} diff --git a/templates/checkout/_partials/steps/personal-information.tpl b/templates/checkout/_partials/steps/personal-information.tpl index c1656e9..ceabc87 100644 --- a/templates/checkout/_partials/steps/personal-information.tpl +++ b/templates/checkout/_partials/steps/personal-information.tpl @@ -1,9 +1,8 @@ {extends file='checkout/_partials/steps/checkout-step.tpl'} {block name='step_content'} - {if !$step_is_complete} {if $customer.is_logged && !$customer.is_guest} -
+
{l s='Connected as [1]%firstname% %lastname%[/1].' d='Shop.Theme.Customeraccount' @@ -27,7 +26,7 @@
{else} -
+
{/if} - {/if} {/block} {** diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl index 635476b..bbd8d3c 100644 --- a/templates/checkout/_partials/steps/shipping.tpl +++ b/templates/checkout/_partials/steps/shipping.tpl @@ -25,7 +25,6 @@ {extends file='checkout/_partials/steps/checkout-step.tpl'} {block name='step_content'} - {if !$step_is_complete}
{$hookDisplayBeforeCarrier nofilter}
@@ -74,19 +73,10 @@
- -
{/foreach} {/block}
-
- - -
- {if $recyclablePackAllowed} @@ -124,5 +114,4 @@
- {/if} {/block} diff --git a/templates/checkout/_partials/steps/unreachable.tpl b/templates/checkout/_partials/steps/unreachable.tpl index 6ecefb8..3dc982a 100644 --- a/templates/checkout/_partials/steps/unreachable.tpl +++ b/templates/checkout/_partials/steps/unreachable.tpl @@ -25,7 +25,7 @@ {block name='step'}
- + {$position} {$title}