Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Release: 8.8.2 #7542

Merged
merged 15 commits into from
Oct 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions assets/js/atomic/blocks/product-elements/button/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ const AddToCartButton = ( {
aria-label={ buttonAriaLabel }
className={ classnames(
'wp-block-button__link',
'wp-element-button',
'add_to_cart_button',
'wc-block-components-product-button__button',
colorStyles.className,
Expand Down Expand Up @@ -206,6 +207,7 @@ const AddToCartButtonPlaceholder = ( {
<button
className={ classnames(
'wp-block-button__link',
'wp-element-button',
'add_to_cart_button',
'wc-block-components-product-button__button',
'wc-block-components-product-button__button--placeholder',
Expand Down
3 changes: 3 additions & 0 deletions assets/js/base/components/form-token-field/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
}

.components-form-token-field__input-container {
background-color: #fff;
border-radius: 0;
box-shadow: none;
color: #000;
position: relative;

input[type="text"].components-form-token-field__input {
Expand Down Expand Up @@ -64,6 +66,7 @@
margin-right: 0;
position: relative;
width: 100%;
z-index: 1;
}

.components-form-token-field__remove-token.components-button,
Expand Down
80 changes: 22 additions & 58 deletions assets/js/base/components/price-slider/style.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* stylelint-disable */

@mixin thumb {
background-color: transparent;
background: $white;
background-position: 0 0;
box-sizing: content-box;
width: 12px;
Expand All @@ -13,25 +13,25 @@
cursor: pointer;
z-index: 20;
pointer-events: auto;
background: $white;
transition: transform .2s ease-in-out;
transition: transform 0.2s ease-in-out;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;

&:hover {
@include thumbFocus;
}
}

@mixin thumbFocus {
background: $gray-900;
border-color: $white;
}

/* stylelint-enable */

@mixin track {
cursor: default;
height: 1px; /* Required for Samsung internet based browsers */
height: 1px;
/* Required for Samsung internet based browsers */
outline: 0;
-webkit-appearance: none;
-moz-appearance: none;
Expand All @@ -54,20 +54,17 @@

.wc-block-components-price-slider {
margin-bottom: $gap-large;

&.is-loading.is-disabled {
.wc-block-components-price-slider__range-input-wrapper,
.wc-block-components-filter-reset-button,
.wc-block-components-filter-submit-button {
@include placeholder();
box-shadow: none;
}

.wc-block-components-price-slider__amount {
display: none;
}
}

&.is-disabled:not(.is-loading) {
.wc-block-components-price-slider__range-input-wrapper,
.wc-block-components-price-slider__amount,
Expand All @@ -79,14 +76,25 @@

.wc-block-components-price-slider__range-input-wrapper {
@include reset;
background: $gray-300;
background: transparent;
border-radius: 4px;
clear: both;
flex-grow: 1;
height: 4px;
margin: 15px 0;
position: relative;

&::before {
content: "";
position: absolute;
top: 0;
right: 0;
left: 0;
bottom: 0;
background: currentColor;
opacity: 0.2;
}

&.is-loading {
@include placeholder();
height: em(9px);
Expand All @@ -101,7 +109,7 @@
top: 0;
width: 100%;
--track-background: linear-gradient(to right, transparent var(--low), var(--range-color) 0, var(--range-color) var(--high), transparent 0) no-repeat 0 100% / 100% 100%;
--range-color: #{$gray-900};
--range-color: currentColor;
/*rtl:ignore*/
background: var(--track-background);
}
Expand All @@ -112,7 +120,6 @@
gap: $gap-smaller;
justify-content: space-between;
margin: $gap 0;

.wc-block-components-price-slider__amount {
margin: 0;
border-radius: 4px;
Expand All @@ -121,11 +128,9 @@
max-width: 80px;
min-width: 0;
padding: $gap-smaller;

.wc-block-components-price-slider--is-input-inline & {
max-width: 60px;
}

&.is-loading {
@include placeholder();
border-radius: 0 !important;
Expand All @@ -146,7 +151,6 @@
display: flex;
gap: $gap;
justify-content: flex-end;

// The specificity here is needed to overwrite the margin-top that is inherited on WC block template pages such as Shop.
button[type="submit"]:not(.wp-block-search__button).wc-block-components-filter-submit-button {
margin-top: 0;
Expand All @@ -165,85 +169,66 @@
position: absolute;
left: 0;
top: 0;

&::-webkit-slider-runnable-track {
@include track;
}

&::-webkit-slider-thumb {
@include thumb;
margin: -5px 0 0 0;
}

&::-webkit-slider-progress {
@include reset;
}

&::-moz-focus-outer {
border: 0;
}

&::-moz-range-track {
@include track;
}

&::-moz-range-progress {
@include reset;
}

&::-moz-range-thumb {
@include thumb;
}

&::-ms-thumb {
@include thumb;
}

&:focus {
&::-webkit-slider-thumb {
@include thumbFocus;
}

&::-moz-range-thumb {
@include thumbFocus;
}

&::-ms-thumb {
@include thumbFocus;
}
}

&.wc-block-components-price-slider__range-input--min {
z-index: 21;

&::-webkit-slider-thumb {
margin-left: -2px;
background-position-x: left;
}

&::-moz-range-thumb {
background-position-x: left;
transform: translate(-2px, 2px);
}

&::-ms-thumb {
background-position-x: left;
}
}

&.wc-block-components-price-slider__range-input--max {
z-index: 20;

&::-webkit-slider-thumb {
background-position-x: right;
margin-left: 2px;
}

&::-moz-range-thumb {
background-position-x: right;
transform: translate(2px, 2px);
}

&::-ms-thumb {
background-position-x: right;
}
Expand Down Expand Up @@ -272,32 +257,25 @@
.wc-block-components-price-slider__range-input {
height: 24px;
pointer-events: auto;

&::-ms-track {
/*remove bg colour from the track, we'll use ms-fill-lower and ms-fill-upper instead */
background: transparent;

/*leave room for the larger thumb to overflow with a transparent border */
border-color: transparent;
border-width: 7px 0;

/*remove default tick marks*/
color: transparent;
}

&::-ms-fill-lower {
background: #e1e1e1;
box-shadow: 0 0 0 1px inset #b8b8b8;
}

&::-ms-fill-upper {
background: transparent;
}

&::-ms-tooltip {
display: none;
}

&::-ms-thumb {
transform: translate(1px, 0);
pointer-events: auto;
Expand All @@ -308,20 +286,17 @@
background: #e1e1e1;
box-shadow: 0 0 0 1px inset #b8b8b8;
}

&::-ms-fill-lower {
background: transparent;
}
}

.wc-block-components-price-slider {
&.is-loading.is-disabled {
.wc-block-components-price-slider__range-input-wrapper {
@include placeholder();
box-shadow: none;
}
}

&.is-disabled:not(.is-loading) {
.wc-block-components-price-slider__range-input-wrapper {
animation: none;
Expand All @@ -330,7 +305,9 @@
}
}


/* IE 11 will not support multi-range slider due to poor pointer-events support on the thumb. Reverts to 2 sliders. */

@include ie11() {
@include ie-fixes();
}
Expand All @@ -342,67 +319,54 @@

.theme-twentytwentyone {
$border-width: 3px;

.wc-block-components-price-slider__range-input-wrapper {
background: transparent;
border: $border-width solid currentColor;
box-sizing: border-box;
}

.wc-block-components-price-slider__range-input-progress {
--range-color: currentColor;
margin: -$border-width;
}

.wc-block-price-filter__range-input {
background: transparent;
margin: -$border-width;
width: calc(100% + #{$border-width * 2});

&:hover,
&:focus {
&::-webkit-slider-thumb {
filter: none;
}

&::-moz-range-thumb {
filter: none;
}

&::-ms-thumb {
filter: none;
}
}

&::-webkit-slider-thumb {
margin-top: -9px;
}

&.wc-block-components-price-slider__range-input--max::-moz-range-thumb {
transform: translate(2px, 1px);
}

&.wc-block-components-price-slider__range-input--min::-moz-range-thumb {
transform: translate(-2px, 1px);
}

&::-ms-track {
border-color: transparent !important;
}
}

@include ie11() {
.wc-block-components-price-slider__range-input-wrapper {
border: 0;
height: auto;
position: relative;
height: 50px;
}

.wc-block-components-price-slider__range-input-progress {
display: none;
}

.wc-block-price-filter__range-input {
height: 100%;
margin: 0;
Expand Down
Loading