Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix QA feedbacks #414

Merged
merged 6 commits into from
Jan 5, 2023
Merged

Fix QA feedbacks #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f349db6
First batch of QA fixes
Dec 20, 2022
ec60a30
Another batch
Dec 21, 2022
e539bd8
Fix voucher errors
Dec 23, 2022
625f20b
Remove closing tags
Dec 23, 2022
781a1a9
Review feedbacks
Jan 2, 2023
03ac364
Review feedbacks
Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/scss/core/components/_search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@ $component-name: search;
margin: 0.5rem 0;

&__product {
margin: 0.5rem 0;
margin: 0.25rem 0;
}

&__link {
display: flex;
align-items: center;
padding: 0.25rem 0.5rem;
border-radius: $border-radius;

&:hover {
background: var(--bs-gray-100);
}
}

&__name {
Expand Down Expand Up @@ -93,8 +99,7 @@ $component-name: search;

&__results {
max-height: 20rem;
padding: 0.5rem 1rem;
padding-right: 1.5rem;
padding: 0.5rem 1.5rem 0.5rem 0.5rem;
margin: 0;
overflow-y: scroll;
}
Expand Down
9 changes: 8 additions & 1 deletion src/scss/core/layout/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@ $component-name: header;
max-width: 100vw;
background-color: var(--header-bg);

a:not(.dropdown-item) {
a:not(.dropdown-item):not(.btn) {
color: var(--header-color);

&:hover {
&,
i {
color: var(--bs-primary);
}
}
}

&__top {
Expand Down
19 changes: 3 additions & 16 deletions src/scss/custom/components/_language-selector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
$component-name: language-selector;

.#{$component-name} {
display: flex;
align-items: center;

> span {
margin-right: 0.5rem;
}

i.expand-more {
color: $default-icon-color;
}

@include media-breakpoint-down(md) {
&__wrapper {
margin-bottom: 1rem;
}
.#{$component-name}__wrapper {
select {
cursor: pointer;
}
}
7 changes: 7 additions & 0 deletions src/scss/custom/modules/_mainmenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
font-weight: 600;
color: $dropdown-link-color;

&:hover {
&,
i {
color: var(--bs-primary);
}
}

&::after {
display: none;
}
Expand Down
16 changes: 16 additions & 0 deletions src/scss/custom/pages/product/_product.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,22 @@
border: 1px $gray-200 solid;
}
}

@include media-breakpoint-down(md) {
.carousel-control-next {
right: 1rem;
}

.carousel-control-prev {
left: 1rem;
}

.carousel-control-prev,
.carousel-control-next {
width: 3rem;
height: 3rem;
}
}
}

// Needs to be outside of the .page-product scope because it can be inside a modal
Expand Down
30 changes: 14 additions & 16 deletions templates/_partials/form-fields.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

{else}

<div class="mb-3 {if !empty($field.errors)}has-error{/if}">
<div class="mb-3{if !empty($field.errors)} has-error{/if}">
{if ($field.type !== 'checkbox')}
<label class="form-label{if $field.required} required{/if}">
<label class="form-label{if $field.required} required{/if}" for="field-{$field.name}">
{if $field.type !== 'checkbox'}
{$field.label}
{/if}
Expand Down Expand Up @@ -55,13 +55,12 @@
class="form-check-input"
type="radio"
name="{$field.name}"
id="{$field.name}_{$value}"
id="field-{$field.name}_{$value}"
value="{$value}"
checked
{if $field.required}required{/if}
{if $value eq $field.value} checked {/if}
>
<label class="form-check-label" for="{$field.name}_{$value}">
<label class="form-check-label" for="field-{$field.name}_{$value}">
{$label}
</label>
</div>
Expand All @@ -78,11 +77,11 @@
name="{$field.name}"
type="checkbox"
value="1"
id="{$field.name}"
id="field-{$field.name}"
value="1" {if $field.value}checked="checked"{/if}
{if $field.required}required{/if}
>
<label class="form-check-label" for="{$field.name}">
<label class="form-check-label" for="field-{$field.name}">
{$field.label nofilter}
</label>
</div>
Expand Down Expand Up @@ -129,6 +128,7 @@
<input
class="form-control js-child-focus js-visible-password"
name="{$field.name}"
id="field-{$field.name}"
type="password"
{if $field.autocomplete}autocomplete="{$field.autocomplete}"{/if}
value=""
Expand Down Expand Up @@ -159,13 +159,14 @@
<input
class="form-control"
name="{$field.name}"
id="field-{$field.name}"
type="{$field.type}"
value="{$field.value}"
{if $field.autocomplete}autocomplete="{$field.autocomplete}"{/if}
{if isset($field.availableValues.placeholder)}placeholder="{$field.availableValues.placeholder}"{/if}
{if $field.maxLength}maxlength="{$field.maxLength}"{/if}
{if $field.required}required{/if}
aria-label="{$field.name}"
{if $field.required}required{/if}
>
{if isset($field.availableValues.comment)}
<span class="form-text">
Expand All @@ -180,13 +181,10 @@
{include file='_partials/form-errors.tpl' errors=$field.errors}
{/block}

<div class="form-text">
{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>
{block name='form_field_comment'}
{if (!$field.required && !in_array($field.type, ['radio-buttons', 'checkbox']))}
<div class="form-text">{l s='Optional' d='Shop.Forms.Labels'}</div>
{/if}
{/block}
</div>

{/if}
2 changes: 1 addition & 1 deletion templates/catalog/_partials/product-cover-thumbnails.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="product__images js-images-container">
{if $product.images|@count > 0}
<div id="product-images" class="carousel slide js-product-carousel"
data-bs-ride="carousel" data-bs-interval="false">
data-bs-ride="carousel">

<div class="carousel-inner">
{include file='catalog/_partials/product-flags.tpl'}
Expand Down
8 changes: 5 additions & 3 deletions templates/checkout/_partials/cart-summary-product-line.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,11 @@
{/if}
</div>

<div class="cart-summary__product__basic">
<span class="cart-summary__product__regular text-decoration-line-through">{$product.regular_price}</span>
</div>
{if $product.has_discount}
<div class="cart-summary__product__basic">
<span class="cart-summary__product__regular text-decoration-line-through">{$product.regular_price}</span>
</div>
{/if}

{hook h='displayProductPriceBlock' product=$product type="unit_price"}
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/checkout/_partials/cart-voucher.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
{/block}

{block name='cart_voucher_notifications'}
<div class="alert alert-danger js-error d-none" role="alert">
<div class="alert alert-danger js-error mt-2" role="alert" style="display: none;">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inline style? 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpodemski this is a core limitation from the core.js file toggling this error when the voucher trigger it

<i class="material-icons">&#xE001;</i><span class="ml-1 js-error-text"></span>
</div>
{/block}
Expand Down
20 changes: 10 additions & 10 deletions templates/customer/_partials/order-messages.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
*}
{block name='order_messages_table'}
{if $order.messages}
<div class="box messages">
<h3>{l s='Messages' d='Shop.Theme.Customeraccount'}</h3>
<div class="customer__messages mb-3">
<h3 class="mb-3">{l s='Messages' d='Shop.Theme.Customeraccount'}</h3>
{foreach from=$order.messages item=message}
<div class="message row">
<div class="col-sm-4">
{$message.name}<br />
{$message.message_date}
</div>
<div class="col-sm-8">
{$message.message nofilter}
</div>
<div class="customer__message border rounded p-3 my-2">
<div class="customer__message__content row">
<div class="col-sm-4 mb-2 mb-sm-0">
<p class="fw-bold mb-0">{$message.name}</p>
<p class="fs-6 mb-0">{$message.message_date}</p>
</div>
<div class="col-sm-8">{$message.message nofilter}</div>
</div>
</div>
{/foreach}
</div>
Expand Down