From 0fefbce8e6249bcdf1dfb9d129ff6538b04ad8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alba=20Rinc=C3=B3n?= Date: Mon, 22 Aug 2022 16:02:07 +0200 Subject: [PATCH 1/4] Update filter button styles --- assets/js/blocks/attribute-filter/style.scss | 7 +++++++ assets/js/blocks/price-filter/style.scss | 7 +++++++ assets/js/blocks/stock-filter/style.scss | 12 ++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/assets/js/blocks/attribute-filter/style.scss b/assets/js/blocks/attribute-filter/style.scss index 73375727ed7..642b1d94fe3 100644 --- a/assets/js/blocks/attribute-filter/style.scss +++ b/assets/js/blocks/attribute-filter/style.scss @@ -67,3 +67,10 @@ } } } + +.editor-styles-wrapper .wc-block-attribute-filter__button.wc-block-attribute-filter__button, +.wc-block-attribute-filter__button.wc-block-attribute-filter__button { + padding: $gap-smaller $gap; + font-size: 0.875em; + border-radius: 2px; +} diff --git a/assets/js/blocks/price-filter/style.scss b/assets/js/blocks/price-filter/style.scss index 03784801a34..cbfc15db569 100644 --- a/assets/js/blocks/price-filter/style.scss +++ b/assets/js/blocks/price-filter/style.scss @@ -26,3 +26,10 @@ border-style: solid; } } + +.editor-styles-wrapper .wc-block-price-filter__button.wc-block-components-price-slider__button, +.wc-block-price-filter__button.wc-block-components-price-slider__button { + padding: $gap-smaller $gap; + font-size: 0.875em; + border-radius: 2px; +} diff --git a/assets/js/blocks/stock-filter/style.scss b/assets/js/blocks/stock-filter/style.scss index 705aad8ebae..6a8881f578c 100644 --- a/assets/js/blocks/stock-filter/style.scss +++ b/assets/js/blocks/stock-filter/style.scss @@ -21,10 +21,6 @@ opacity: 0.6; } - .wc-block-stock-filter__button { - margin-top: $gap-smaller; - } - .wc-block-stock-filter__actions { align-items: center; display: flex; @@ -39,3 +35,11 @@ } } } + +.editor-styles-wrapper .wc-block-stock-filter .wp-block-button__link, +.wc-block-stock-filter .wc-block-stock-filter__button { + margin-top: $gap-smaller; + padding: $gap-smaller $gap; + font-size: 0.875em; + border-radius: 2px; +} From 5fad95197751fc20475a10d26bd4f176bc132318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alba=20Rinc=C3=B3n?= Date: Tue, 23 Aug 2022 10:39:31 +0200 Subject: [PATCH 2/4] Address feedback: use mixings --- assets/js/blocks/attribute-filter/style.scss | 5 ++--- assets/js/blocks/price-filter/style.scss | 5 ++--- assets/js/blocks/stock-filter/style.scss | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/assets/js/blocks/attribute-filter/style.scss b/assets/js/blocks/attribute-filter/style.scss index 642b1d94fe3..fc6d5374184 100644 --- a/assets/js/blocks/attribute-filter/style.scss +++ b/assets/js/blocks/attribute-filter/style.scss @@ -70,7 +70,6 @@ .editor-styles-wrapper .wc-block-attribute-filter__button.wc-block-attribute-filter__button, .wc-block-attribute-filter__button.wc-block-attribute-filter__button { - padding: $gap-smaller $gap; - font-size: 0.875em; - border-radius: 2px; + padding: em($gap-smaller) em($gap); + @include font-size(small); } diff --git a/assets/js/blocks/price-filter/style.scss b/assets/js/blocks/price-filter/style.scss index cbfc15db569..4038c964e25 100644 --- a/assets/js/blocks/price-filter/style.scss +++ b/assets/js/blocks/price-filter/style.scss @@ -29,7 +29,6 @@ .editor-styles-wrapper .wc-block-price-filter__button.wc-block-components-price-slider__button, .wc-block-price-filter__button.wc-block-components-price-slider__button { - padding: $gap-smaller $gap; - font-size: 0.875em; - border-radius: 2px; + padding: em($gap-smaller) em($gap); + @include font-size(small); } diff --git a/assets/js/blocks/stock-filter/style.scss b/assets/js/blocks/stock-filter/style.scss index 6a8881f578c..cdf76dc9d6e 100644 --- a/assets/js/blocks/stock-filter/style.scss +++ b/assets/js/blocks/stock-filter/style.scss @@ -38,8 +38,7 @@ .editor-styles-wrapper .wc-block-stock-filter .wp-block-button__link, .wc-block-stock-filter .wc-block-stock-filter__button { - margin-top: $gap-smaller; - padding: $gap-smaller $gap; - font-size: 0.875em; - border-radius: 2px; + margin-top: em($gap-smaller); + padding: em($gap-smaller) em($gap); + @include font-size(small); } From 64b3b0ef6f8ad6f858d1beddf79d65f7006ee930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alba=20Rinc=C3=B3n?= Date: Tue, 23 Aug 2022 11:45:17 +0200 Subject: [PATCH 3/4] Improve the editor selector for stock apply button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Albert Juhé Lluveras --- assets/js/blocks/stock-filter/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/blocks/stock-filter/style.scss b/assets/js/blocks/stock-filter/style.scss index cdf76dc9d6e..ac3d0ed1223 100644 --- a/assets/js/blocks/stock-filter/style.scss +++ b/assets/js/blocks/stock-filter/style.scss @@ -36,7 +36,7 @@ } } -.editor-styles-wrapper .wc-block-stock-filter .wp-block-button__link, +.editor-styles-wrapper .wc-block-stock-filter .wc-block-stock-filter__button, .wc-block-stock-filter .wc-block-stock-filter__button { margin-top: em($gap-smaller); padding: em($gap-smaller) em($gap); From 85ddd8134cc3d6e774b7d896978c855e7cf770cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alba=20Rinc=C3=B3n?= Date: Tue, 23 Aug 2022 12:14:56 +0200 Subject: [PATCH 4/4] Reduce vertical margin and input width --- assets/js/base/components/price-slider/style.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/base/components/price-slider/style.scss b/assets/js/base/components/price-slider/style.scss index becb6dd49d0..b93622dd32d 100644 --- a/assets/js/base/components/price-slider/style.scss +++ b/assets/js/base/components/price-slider/style.scss @@ -102,14 +102,14 @@ display: flex; gap: $gap-smaller; justify-content: space-between; - margin: $gap-large 0; + margin: $gap 0; .wc-block-components-price-slider__amount { margin: 0; border-radius: 4px; border-width: 1px; width: auto; - max-width: 100px; + max-width: 80px; min-width: 0; padding: $gap-smaller; }