This commit is contained in:
Roman Pyrih
2024-11-26 16:48:33 +01:00
parent 1994d995d8
commit 22bf30902e
10 changed files with 494 additions and 218 deletions

View File

@@ -711,9 +711,110 @@ body#checkout #content-wrapper .cart-grid-body .checkout-step.-current .step-tit
color: #e79332;
border-bottom: 1px solid #e79332;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step.-complete {
opacity: 0.5;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .content {
padding: 0;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step #customer-form {
max-width: 480px;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-group label {
color: #110e0c;
font-size: 12px;
font-family: "Inter", sans-serif;
font-weight: 500;
margin-bottom: 4px;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-group input.form-control {
background: rgba(70, 45, 38, 0.1019607843);
border: 1px solid rgba(70, 45, 38, 0.1411764706);
padding: 14px 16px;
color: #110e0c;
font-size: 14px;
font-family: "Inter", sans-serif;
font-weight: 500;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-group .btn-show-password-box {
position: absolute;
top: 0;
right: 0;
bottom: 0;
width: -moz-fit-content;
width: fit-content;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-group .btn-show-password-box .btn-show-password {
padding: 0;
background: transparent;
display: flex;
height: 100%;
align-items: center;
width: 30px;
outline: none;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-group .form-control-comment {
color: rgba(70, 45, 38, 0.8509803922);
font-size: 12px;
font-family: "Inter", sans-serif;
font-weight: 400;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-informations {
margin-top: 40px;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-informations .form-informations-title {
color: #110e0c;
font-size: 16px;
font-family: "Inter", sans-serif;
font-weight: 700;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-informations .form-informations-option {
color: #110e0c;
font-size: 16px;
font-family: "Inter", sans-serif;
font-weight: 400;
font-style: initial !important;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-informations .form-informations-subtitle {
display: none;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-footer {
text-align: start;
width: -moz-fit-content;
width: fit-content;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .form-footer .btn {
color: #f9f7f2;
font-size: 14px;
font-weight: 500;
font-family: "Inter", sans-serif;
background: #e79332;
padding: 12px 80px;
text-transform: initial;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step #delivery-address {
max-width: 480px;
margin-left: 0;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .delivery-options {
max-width: 480px;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .delivery-options .delivery-option {
padding: 12px 16px;
margin: 0;
border: 1px solid rgba(70, 45, 38, 0.1411764706);
border-radius: 1px;
-moz-column-gap: 16px;
column-gap: 16px;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .delivery-options .delivery-option .delivery-option-checkbox {
width: -moz-fit-content;
width: fit-content;
line-height: 0;
}
body#checkout #content-wrapper .cart-grid-body .checkout-step .delivery-options .delivery-option .delivery-option-2 {
flex: 1;
}
body#checkout #content-wrapper #js-checkout-summary {
background: transparent;
}
@@ -1395,4 +1496,77 @@ body#cms section#main header.page-header h1 {
font-family: "Inter", sans-serif;
font-size: 12px;
font-weight: 500;
}
.custom-checkbox {
display: flex;
align-items: flex-start;
-moz-column-gap: 10px;
column-gap: 10px;
}
.custom-checkbox label {
padding: 0;
margin: 0;
cursor: pointer;
color: #110e0c;
font-size: 14px;
font-family: "Inter", sans-serif;
font-weight: 400;
}
input[type=checkbox],
input[type=radio] {
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
position: relative;
width: 15px;
height: 15px;
min-width: 15px;
min-height: 15px;
display: inline-block;
border: 1px solid #d9cebe;
border-radius: 3px;
transition: all 250ms ease-in-out;
overflow: hidden;
cursor: pointer;
}
input[type=checkbox]::before,
input[type=radio]::before {
content: "";
position: absolute;
top: -5px;
left: 15px;
width: 7px;
height: 2px;
background: #f9f7f2;
transform: rotate(-45deg);
transition: all 250ms ease-in-out;
}
input[type=checkbox]::after,
input[type=radio]::after {
content: "";
position: absolute;
top: -4px;
left: -8px;
width: 4px;
height: 2px;
background: #f9f7f2;
transform: rotate(45deg);
transition: all 250ms ease-in-out;
}
input[type=checkbox]:checked,
input[type=radio]:checked {
background: #462d26;
border-color: #462d26;
}
input[type=checkbox]:checked::before,
input[type=radio]:checked::before {
top: 6px;
left: 4px;
}
input[type=checkbox]:checked::after,
input[type=radio]:checked::after {
top: 7px;
left: 3px;
}/*# sourceMappingURL=custom.css.map */

File diff suppressed because one or more lines are too long

View File

@@ -989,10 +989,124 @@ body#checkout {
border-bottom: 1px solid #e79332;
}
}
&.-complete {
opacity: 0.5;
}
.content {
padding: 0;
}
#customer-form {
max-width: 480px;
}
.form-group {
label {
color: #110e0c;
font-size: 12px;
font-family: $fInter;
font-weight: 500;
margin-bottom: 4px;
}
input {
&.form-control {
background: #462d261a;
border: 1px solid #462d2624;
padding: 14px 16px;
color: #110e0c;
font-size: 14px;
font-family: $fInter;
font-weight: 500;
}
}
.btn-show-password-box {
position: absolute;
top: 0;
right: 0;
bottom: 0;
width: fit-content;
.btn-show-password {
padding: 0;
background: transparent;
display: flex;
height: 100%;
align-items: center;
width: 30px;
outline: none;
}
}
.form-control-comment {
color: rgba(70, 45, 38, 0.8509803922);
font-size: 12px;
font-family: $fInter;
font-weight: 400;
}
}
.form-informations {
margin-top: 40px;
.form-informations-title {
color: #110e0c;
font-size: 16px;
font-family: $fInter;
font-weight: 700;
}
.form-informations-option {
color: #110e0c;
font-size: 16px;
font-family: $fInter;
font-weight: 400;
font-style: initial !important;
}
.form-informations-subtitle {
display: none;
}
}
.form-footer {
text-align: start;
width: fit-content;
.btn {
color: #f9f7f2;
font-size: 14px;
font-weight: 500;
font-family: $fInter;
background: #e79332;
padding: 12px 80px;
text-transform: initial;
}
}
#delivery-address {
max-width: 480px;
margin-left: 0;
}
.delivery-options {
max-width: 480px;
.delivery-option {
padding: 12px 16px;
margin: 0;
border: 1px solid #462d2624;
border-radius: 1px;
column-gap: 16px;
.delivery-option-checkbox {
width: fit-content;
line-height: 0;
}
.delivery-option-2 {
flex: 1;
}
}
}
}
}
@@ -1933,3 +2047,75 @@ body#cms {
}
}
}
.custom-checkbox {
display: flex;
align-items: flex-start;
column-gap: 10px;
label {
padding: 0;
margin: 0;
cursor: pointer;
color: #110e0c;
font-size: 14px;
font-family: $fInter;
font-weight: 400;
}
}
input[type='checkbox'],
input[type='radio'] {
appearance: none;
position: relative;
width: 15px;
height: 15px;
min-width: 15px;
min-height: 15px;
display: inline-block;
border: 1px solid #d9cebe;
border-radius: 3px;
transition: all 250ms ease-in-out;
overflow: hidden;
cursor: pointer;
&::before {
content: '';
position: absolute;
top: -5px;
left: 15px;
width: 7px;
height: 2px;
background: #f9f7f2;
transform: rotate(-45deg);
transition: all 250ms ease-in-out;
}
&::after {
content: '';
position: absolute;
top: -4px;
left: -8px;
width: 4px;
height: 2px;
background: #f9f7f2;
transform: rotate(45deg);
transition: all 250ms ease-in-out;
}
&:checked {
background: #462d26;
border-color: #462d26;
&::before {
top: 6px;
left: 4px;
}
&::after {
top: 7px;
left: 3px;
}
}
}

View File

@@ -4088,14 +4088,6 @@ tbody.collapse.in {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#fff' d='M0 2h4'/%3E%3C/svg%3E");
}
.custom-radio .custom-control-indicator {
border-radius: 50%;
}
.custom-radio .custom-control-input:checked ~ .custom-control-indicator {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#fff'/%3E%3C/svg%3E");
}
.custom-controls-stacked .custom-control {
float: left;
clear: left;
@@ -7596,10 +7588,6 @@ textarea:active:-moz-placeholder {
font-size: 0.9375rem;
}
.radio-inline .custom-radio {
margin-right: 0.5rem;
}
.radio-inline:first-of-type {
margin-right: 1rem;
}
@@ -7624,79 +7612,10 @@ form .form-control-label {
color: #232323;
}
.custom-radio {
position: relative;
display: inline-block;
width: 18px;
height: 18px;
margin-top: 0.1rem;
margin-right: 0.5rem;
vertical-align: middle;
cursor: pointer;
background: #fff;
border: #979797 1px solid;
border-radius: 50%;
}
.custom-radio input[type=radio] {
cursor: pointer;
opacity: 0;
}
.custom-radio input[type=radio]:checked + span {
position: absolute;
top: 0.125rem;
left: 0.125rem;
display: block;
width: 12px;
height: 12px;
background-color: #24b9d7;
border-radius: 50%;
}
.custom-radio input[type=radio]:focus + span {
border-color: #7a7a7a;
}
.custom-checkbox {
position: relative;
}
.custom-checkbox input[type=checkbox] {
position: absolute;
width: 18px;
height: 18px;
margin-top: 0.25rem;
cursor: pointer;
opacity: 0;
}
.custom-checkbox input[type=checkbox] + span {
display: inline-block;
width: 1.125rem;
height: 1.125rem;
margin-right: 0.5rem;
vertical-align: middle;
pointer-events: none;
cursor: pointer;
border: 1px #979797 solid;
}
.custom-checkbox input[type=checkbox] + span .checkbox-checked {
display: none;
margin: -0.125rem;
font-size: 1.25rem;
color: #232323;
}
.custom-checkbox input[type=checkbox]:checked + span .checkbox-checked {
display: block;
}
.custom-checkbox input[type=checkbox]:focus + span {
border-color: #7a7a7a;
}
.custom-checkbox label {
text-align: left;
}
@@ -8320,10 +8239,6 @@ body#checkout .custom-checkbox {
display: flex;
}
body#checkout .custom-checkbox > label {
padding-left: 1.5rem;
}
body#checkout .custom-checkbox span {
position: absolute;
top: 0.025rem;
@@ -8417,10 +8332,6 @@ body#checkout section.checkout-step.-reachable.-complete h1 .done {
display: inline-block;
}
body#checkout section.checkout-step.-reachable.-complete h1 .step-number {
display: none;
}
body#checkout section.checkout-step.-reachable.-complete h1 .step-edit {
display: block;
float: right;
@@ -8527,11 +8438,6 @@ body#checkout section.checkout-step .radio-block {
cursor: pointer;
}
body#checkout section.checkout-step .custom-radio input[type=radio] {
width: 1.25rem;
height: 1.25rem;
}
body#checkout section.checkout-step .delete-address,
body#checkout section.checkout-step .edit-address {
display: inline-block;

File diff suppressed because one or more lines are too long

View File

@@ -4372,13 +4372,13 @@ tbody.collapse.in {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#fff' d='M0 2h4'/%3E%3C/svg%3E");
}
.custom-radio .custom-control-indicator {
border-radius: 50%;
}
// .custom-radio .custom-control-indicator {
// border-radius: 50%;
// }
.custom-radio .custom-control-input:checked ~ .custom-control-indicator {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#fff'/%3E%3C/svg%3E");
}
// .custom-radio .custom-control-input:checked ~ .custom-control-indicator {
// background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#fff'/%3E%3C/svg%3E");
// }
.custom-controls-stacked .custom-control {
float: left;
@@ -8063,9 +8063,9 @@ textarea:active:-moz-placeholder {
font-size: 0.9375rem;
}
.radio-inline .custom-radio {
margin-right: 0.5rem;
}
// .radio-inline .custom-radio {
// margin-right: 0.5rem;
// }
.radio-inline:first-of-type {
margin-right: 1rem;
@@ -8091,78 +8091,78 @@ form .form-control-label {
color: #232323;
}
.custom-radio {
position: relative;
display: inline-block;
width: 18px;
height: 18px;
margin-top: 0.1rem;
margin-right: 0.5rem;
vertical-align: middle;
cursor: pointer;
background: #fff;
border: #979797 1px solid;
border-radius: 50%;
}
// .custom-radio {
// position: relative;
// display: inline-block;
// width: 18px;
// height: 18px;
// margin-top: 0.1rem;
// margin-right: 0.5rem;
// vertical-align: middle;
// cursor: pointer;
// background: #fff;
// border: #979797 1px solid;
// border-radius: 50%;
// }
.custom-radio input[type='radio'] {
cursor: pointer;
opacity: 0;
}
// .custom-radio input[type='radio'] {
// cursor: pointer;
// opacity: 0;
// }
.custom-radio input[type='radio']:checked + span {
position: absolute;
top: 0.125rem;
left: 0.125rem;
display: block;
width: 12px;
height: 12px;
background-color: #24b9d7;
border-radius: 50%;
}
// .custom-radio input[type='radio']:checked + span {
// position: absolute;
// top: 0.125rem;
// left: 0.125rem;
// display: block;
// width: 12px;
// height: 12px;
// background-color: #24b9d7;
// border-radius: 50%;
// }
.custom-radio input[type='radio']:focus + span {
border-color: #7a7a7a;
}
// .custom-radio input[type='radio']:focus + span {
// border-color: #7a7a7a;
// }
.custom-checkbox {
position: relative;
}
.custom-checkbox input[type='checkbox'] {
position: absolute;
width: 18px;
height: 18px;
margin-top: 0.25rem;
cursor: pointer;
opacity: 0;
}
// .custom-checkbox input[type='checkbox'] {
// position: absolute;
// width: 18px;
// height: 18px;
// margin-top: 0.25rem;
// cursor: pointer;
// opacity: 0;
// }
.custom-checkbox input[type='checkbox'] + span {
display: inline-block;
width: 1.125rem;
height: 1.125rem;
margin-right: 0.5rem;
vertical-align: middle;
pointer-events: none;
cursor: pointer;
border: 1px #979797 solid;
}
// .custom-checkbox input[type='checkbox'] + span {
// display: inline-block;
// width: 1.125rem;
// height: 1.125rem;
// margin-right: 0.5rem;
// vertical-align: middle;
// pointer-events: none;
// cursor: pointer;
// border: 1px #979797 solid;
// }
.custom-checkbox input[type='checkbox'] + span .checkbox-checked {
display: none;
margin: -0.125rem;
font-size: 1.25rem;
color: #232323;
}
// .custom-checkbox input[type='checkbox'] + span .checkbox-checked {
// display: none;
// margin: -0.125rem;
// font-size: 1.25rem;
// color: #232323;
// }
.custom-checkbox input[type='checkbox']:checked + span .checkbox-checked {
display: block;
}
// .custom-checkbox input[type='checkbox']:checked + span .checkbox-checked {
// display: block;
// }
.custom-checkbox input[type='checkbox']:focus + span {
border-color: #7a7a7a;
}
// .custom-checkbox input[type='checkbox']:focus + span {
// border-color: #7a7a7a;
// }
.custom-checkbox label {
text-align: left;
@@ -8837,9 +8837,9 @@ body#checkout .custom-checkbox {
display: flex;
}
body#checkout .custom-checkbox > label {
padding-left: 1.5rem;
}
// body#checkout .custom-checkbox > label {
// padding-left: 1.5rem;
// }
body#checkout .custom-checkbox span {
position: absolute;
@@ -8970,7 +8970,7 @@ body#checkout section.checkout-step.-reachable.-complete h1 .done {
}
body#checkout section.checkout-step.-reachable.-complete h1 .step-number {
display: none;
// display: none;
}
body#checkout section.checkout-step.-reachable.-complete h1 .step-edit {
@@ -9108,10 +9108,10 @@ body#checkout section.checkout-step .radio-block {
cursor: pointer;
}
body#checkout section.checkout-step .custom-radio input[type='radio'] {
width: 1.25rem;
height: 1.25rem;
}
// body#checkout section.checkout-step .custom-radio input[type='radio'] {
// width: 1.25rem;
// height: 1.25rem;
// }
body#checkout section.checkout-step .delete-address,
body#checkout section.checkout-step .edit-address {

View File

@@ -30,13 +30,17 @@
{else}
<div class="form-group row {if !empty($field.errors)}has-error{/if}">
<label class="col-md-3 form-control-label{if $field.required} required{/if}" for="field-{$field.name}">
{if $field.type !== 'checkbox'}
{$field.label}
{/if}
</label>
<div class="col-md-6{if ($field.type === 'radio-buttons')} form-control-valign{/if}">
<div class="form-group {if !empty($field.errors)}has-error{/if}">
{if $field.type !== 'checkbox'}
<label class="{if $field.required} required{/if}" for="field-{$field.name}">
{if $field.type !== 'checkbox'}
{$field.label}
{if $field.required}*{/if}
{/if}
</label>
{/if}
{* <div class="col-md-6{if ($field.type === 'radio-buttons')} form-control-valign{/if}"> *}
{if $field.type === 'select'}
@@ -68,33 +72,38 @@
{elseif $field.type === 'radio-buttons'}
{block name='form_field_item_radio'}
{foreach from=$field.availableValues item="label" key="value"}
<label class="radio-inline" for="field-{$field.name}-{$value}">
<span class="custom-radio">
<input
name="{$field.name}"
id="field-{$field.name}-{$value}"
type="radio"
value="{$value}"
{if $field.required}required{/if}
{if $value eq $field.value} checked {/if}
>
<span></span>
</span>
{$label}
</label>
{/foreach}
<div class="form-check">
{foreach from=$field.availableValues item="label" key="value"}
<label class="radio-inline" for="field-{$field.name}-{$value}">
<span class="custom-radio">
<input
name="{$field.name}"
id="field-{$field.name}-{$value}"
type="radio"
value="{$value}"
{if $field.required}required{/if}
{if $value eq $field.value} checked {/if}
>
<span></span>
</span>
{$label}
</label>
{/foreach}
</div>
{/block}
{elseif $field.type === 'checkbox'}
{block name='form_field_item_checkbox'}
<span class="custom-checkbox">
<label>
<input name="{$field.name}" type="checkbox" value="1" {if $field.value}checked="checked"{/if} {if $field.required}required{/if}>
<span><i class="material-icons rtl-no-flip checkbox-checked">&#xE5CA;</i></span>
{$field.label nofilter}
</label>
{* <label> *}
<input name="{$field.name}" id="custom-checkbox-{$field.name}" type="checkbox" value="1" {if $field.value}checked="checked"{/if} {if $field.required}required{/if}>
{* <span><i class="material-icons rtl-no-flip checkbox-checked">&#xE5CA;</i></span> *}
<label for="custom-checkbox-{$field.name}">
{$field.label nofilter}
{if $field.required}*{/if}
</label>
{* </label> *}
</span>
{/block}
@@ -147,15 +156,16 @@
pattern=".{literal}{{/literal}5,{literal}}{/literal}"
{if $field.required}required{/if}
>
<span class="input-group-btn">
<span class="input-group-btn btn-show-password-box">
<button
class="btn"
class="btn btn-show-password"
type="button"
data-action="show-password"
data-text-show="{l s='Show' d='Shop.Theme.Actions'}"
data-text-hide="{l s='Hide' d='Shop.Theme.Actions'}"
{* data-text-show="{l s='Show' d='Shop.Theme.Actions'}" *}
{* data-text-hide="{l s='Hide' d='Shop.Theme.Actions'}" *}
>
{l s='Show' d='Shop.Theme.Actions'}
{* {l s='Show' d='Shop.Theme.Actions'} *}
<img src='/img/cms/icons/eye.svg' />
</button>
</span>
</div>
@@ -188,15 +198,15 @@
{include file='_partials/form-errors.tpl' errors=$field.errors}
{/block}
</div>
{* </div> *}
<div class="col-md-3 form-control-comment">
{* <div class="col-md-3 form-control-comment">
{block name='form_field_comment'}
{if (!$field.required && !in_array($field.type, ['radio-buttons', 'checkbox']))}
{l s='Optional' d='Shop.Forms.Labels'}
{/if}
{/block}
</div>
</div> *}
</div>
{/if}

View File

@@ -33,7 +33,7 @@
]|classnames}"
>
<h1 class="step-title js-step-title h3">
<i class="material-icons rtl-no-flip done">&#xE876;</i>
{* <i class="material-icons rtl-no-flip done">&#xE876;</i> *}
<span class="step-number">{$position}</span>
{$title}
<span class="step-edit text-muted"><i class="material-icons edit">mode_edit</i> {l s='Edit' d='Shop.Theme.Actions'}</span>

View File

@@ -42,22 +42,22 @@
<div class="delivery-options">
{foreach from=$delivery_options item=carrier key=carrier_id}
<div class="row delivery-option js-delivery-option">
<div class="col-sm-1">
<span class="custom-radio float-xs-left">
<div class="delivery-option-checkbox">
<span class="custom-radio">
<input type="radio" name="delivery_option[{$id_address}]" id="delivery_option_{$carrier.id}" value="{$carrier_id}"{if $delivery_option == $carrier_id} checked{/if}>
<span></span>
</span>
</div>
<label for="delivery_option_{$carrier.id}" class="col-xs-9 col-sm-11 delivery-option-2">
<label for="delivery_option_{$carrier.id}" class="delivery-option-2">
<div class="row">
<div class="col-sm-5 col-xs-12">
<div class="row carrier{if $carrier.logo} carrier-hasLogo{/if}">
{if $carrier.logo}
<div class="col-xs-12 col-md-4 carrier-logo">
<div class="carrier-logo">
<img src="{$carrier.logo}" alt="{$carrier.name}" loading="lazy" />
</div>
{/if}
<div class="col-xs-12 carriere-name-container{if $carrier.logo} col-md-8{/if}">
<div class="carriere-name-container{if $carrier.logo} col-md-8{/if}">
<span class="h6 carrier-name">{$carrier.name}</span>
</div>
</div>