From 2f44470754260ab249a80a93eb5a307f666aa27b Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Fri, 30 Jul 2021 23:34:37 +0700 Subject: [PATCH 1/7] Fix incorrect less escape --- app/design/frontend/Magento/blank/web/css/source/_extends.less | 2 +- app/design/frontend/Magento/luma/web/css/source/_extends.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less index 32e18921a1c48..08f540c5f82f4 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_extends.less +++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less @@ -1208,7 +1208,7 @@ & when (@media-common = true) { .abs-field-date-input { margin-right: @indent__s; - width: calc(~'100% -' @icon-calendar__font-size + @indent__s); + width: calc(~'100%' - (@icon-calendar__font-size + @indent__s)); } } diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less index 4d5e6f55908da..953b1d7737594 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_extends.less +++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less @@ -1638,7 +1638,7 @@ & when (@media-common = true) { .abs-field-date-input { .lib-css(margin-right, @indent__s); - width: calc(~'100% -' @icon-calendar__font-size + @indent__s); + width: calc(~'100%' - (@icon-calendar__font-size + @indent__s)); } } From d5e4af066412eeb0e629052e0a60baffeec17bf4 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Tue, 22 Feb 2022 07:42:25 +0700 Subject: [PATCH 2/7] Update _extends.less tooltip field escape --- app/design/frontend/Magento/blank/web/css/source/_extends.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less index 08f540c5f82f4..9d8a51ee4f681 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_extends.less +++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less @@ -1223,7 +1223,7 @@ input { margin-right: @indent__s; - width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs); + width: calc(~'100%' - (@checkout-tooltip-icon__font-size + @indent__s + @indent__xs)); } } } From dc2cbd97c86ecefed3bac040e1ff8310457bca9b Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Tue, 22 Feb 2022 07:43:26 +0700 Subject: [PATCH 3/7] Luma Tooltip field escape less --- app/design/frontend/Magento/luma/web/css/source/_extends.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less index 953b1d7737594..674aa5f1e32d0 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_extends.less +++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less @@ -1653,7 +1653,7 @@ input { .lib-css(margin-right, @indent__s); - width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs); + width: calc(~'100%' - (@checkout-tooltip-icon__font-size + @indent__s + @indent__xs)); } } } From 796b63271fd45ccf995db8cb1a8a61b764823ddb Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Wed, 8 Mar 2023 21:24:16 +0700 Subject: [PATCH 4/7] update blank styles --- .../frontend/Magento/blank/web/css/source/_extends.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less index 9d8a51ee4f681..f2c312c96ce96 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_extends.less +++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less @@ -1208,7 +1208,7 @@ & when (@media-common = true) { .abs-field-date-input { margin-right: @indent__s; - width: calc(~'100%' - (@icon-calendar__font-size + @indent__s)); + width: ~"calc(100% - @{icon-calendar__font-size} + @{indent__s})"; } } @@ -1223,7 +1223,7 @@ input { margin-right: @indent__s; - width: calc(~'100%' - (@checkout-tooltip-icon__font-size + @indent__s + @indent__xs)); + width: ~"calc(100% - @{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})"; } } } From 247d9d90f3c268fc9539396fea2efbb1e14904d0 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Wed, 8 Mar 2023 21:27:38 +0700 Subject: [PATCH 5/7] Update luma styles --- app/design/frontend/Magento/luma/web/css/source/_extends.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less index 674aa5f1e32d0..50724f6246c56 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_extends.less +++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less @@ -1638,7 +1638,7 @@ & when (@media-common = true) { .abs-field-date-input { .lib-css(margin-right, @indent__s); - width: calc(~'100%' - (@icon-calendar__font-size + @indent__s)); + width: ~"calc(100% - @{icon-calendar__font-size} + @{indent__s})"; } } @@ -1653,7 +1653,7 @@ input { .lib-css(margin-right, @indent__s); - width: calc(~'100%' - (@checkout-tooltip-icon__font-size + @indent__s + @indent__xs)); + width: ~"calc(100% - @{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})"; } } } From 64a303582f725ae7d9d17fc7f9b1bb7535ff67f2 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Sun, 12 Mar 2023 10:34:01 +0700 Subject: [PATCH 6/7] Add parentheses --- .../frontend/Magento/blank/web/css/source/_extends.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less index 6aea69eb8769c..1f99cf6946cf7 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_extends.less +++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less @@ -1219,7 +1219,7 @@ & when (@media-common = true) { .abs-field-date-input { margin-right: @indent__s; - width: ~"calc(100% - @{icon-calendar__font-size} + @{indent__s})"; + width: ~"calc(100% - (@{icon-calendar__font-size} + @{indent__s}))"; } } @@ -1234,7 +1234,7 @@ input { margin-right: @indent__s; - width: ~"calc(100% - @{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})"; + width: ~"calc(100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs}))"; } } } From 872cdc84c683e7a9ec778c9d4bcf2e74498e5b27 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Sun, 12 Mar 2023 10:34:44 +0700 Subject: [PATCH 7/7] Add parentheses --- app/design/frontend/Magento/luma/web/css/source/_extends.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less index 50724f6246c56..9947b69bb9460 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_extends.less +++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less @@ -1638,7 +1638,7 @@ & when (@media-common = true) { .abs-field-date-input { .lib-css(margin-right, @indent__s); - width: ~"calc(100% - @{icon-calendar__font-size} + @{indent__s})"; + width: ~"calc(100% - (@{icon-calendar__font-size} + @{indent__s}))"; } } @@ -1653,7 +1653,7 @@ input { .lib-css(margin-right, @indent__s); - width: ~"calc(100% - @{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})"; + width: ~"calc(100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs}))"; } } }