From 02174cd86b6652b13e46fc68d7afb77843b57703 Mon Sep 17 00:00:00 2001 From: Ludo Segura Date: Tue, 2 May 2023 15:20:24 -0400 Subject: [PATCH 1/4] Fix transform applied when it should not for sliders --- assets/base.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/base.css b/assets/base.css index 03dc062b6b9..6c2c7730aad 100644 --- a/assets/base.css +++ b/assets/base.css @@ -982,6 +982,7 @@ summary::-webkit-details-marker { .slider--mobile .scroll-trigger:not(.scroll-trigger--offscreen).animate--slide-in { animation: none; opacity: 1; + transform: inherit; } .scroll-trigger:not(.scroll-trigger--offscreen) .slider--tablet { @@ -1018,6 +1019,7 @@ summary::-webkit-details-marker { .slider--desktop .scroll-trigger:not(.scroll-trigger--offscreen).animate--slide-in { animation: none; opacity: 1; + transform: inherit; } .scroll-trigger:not(.scroll-trigger--offscreen) .slider--desktop { From 6e1b7355a7a6a7fb08affa1b14a8fed18f03c2ee Mon Sep 17 00:00:00 2001 From: Ludo Segura Date: Tue, 2 May 2023 16:17:07 -0400 Subject: [PATCH 2/4] fix variable declaration on the password page --- layout/password.liquid | 1 + 1 file changed, 1 insertion(+) diff --git a/layout/password.liquid b/layout/password.liquid index 3d054360e28..70559c89c6b 100644 --- a/layout/password.liquid +++ b/layout/password.liquid @@ -60,6 +60,7 @@ --color-badge-background: {{ scheme.settings.background.red }},{{ scheme.settings.background.green }},{{ scheme.settings.background.blue }}; --color-badge-border: {{ scheme.settings.text.red }},{{ scheme.settings.text.green }},{{ scheme.settings.text.blue }}; --payment-terms-background-color: rgb({{ scheme.settings.background.rgb }}); + } {% endfor %} {{ scheme_classes | prepend: 'body' }} { From f783fda06d727ce6d9f990f0006118d2602b673d Mon Sep 17 00:00:00 2001 From: Ludo Segura Date: Tue, 2 May 2023 16:18:29 -0400 Subject: [PATCH 3/4] remove extra changes --- assets/base.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/base.css b/assets/base.css index 6c2c7730aad..03dc062b6b9 100644 --- a/assets/base.css +++ b/assets/base.css @@ -982,7 +982,6 @@ summary::-webkit-details-marker { .slider--mobile .scroll-trigger:not(.scroll-trigger--offscreen).animate--slide-in { animation: none; opacity: 1; - transform: inherit; } .scroll-trigger:not(.scroll-trigger--offscreen) .slider--tablet { @@ -1019,7 +1018,6 @@ summary::-webkit-details-marker { .slider--desktop .scroll-trigger:not(.scroll-trigger--offscreen).animate--slide-in { animation: none; opacity: 1; - transform: inherit; } .scroll-trigger:not(.scroll-trigger--offscreen) .slider--desktop { From bc72d0554efddeff27243b284080b157ce763774 Mon Sep 17 00:00:00 2001 From: Ludo Segura Date: Tue, 2 May 2023 16:22:08 -0400 Subject: [PATCH 4/4] indentation fix --- layout/password.liquid | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/layout/password.liquid b/layout/password.liquid index 70559c89c6b..e5f80856a5f 100644 --- a/layout/password.liquid +++ b/layout/password.liquid @@ -44,22 +44,22 @@ {%- endif %} .color-{{ scheme.id }} { --color-background: {{ scheme.settings.background.red }},{{ scheme.settings.background.green }},{{ scheme.settings.background.blue }}; - {% if scheme.settings.background_gradient != empty %} - --gradient-background: {{ scheme.settings.background_gradient }}; - {% else %} - --gradient-background: {{ scheme.settings.background }}; - {% endif %} - --color-foreground: {{ scheme.settings.text.red }},{{ scheme.settings.text.green }},{{ scheme.settings.text.blue }}; - --color-shadow: {{ scheme.settings.shadow.red }},{{ scheme.settings.shadow.green }},{{ scheme.settings.shadow.blue }}; - --color-button: {{ scheme.settings.button.red }},{{ scheme.settings.button.green }},{{ scheme.settings.button.blue }}; - --color-button-text: {{ scheme.settings.button_label.red }},{{ scheme.settings.button_label.green }},{{ scheme.settings.button_label.blue }}; - --color-secondary-button: {{ scheme.settings.background.red }},{{ scheme.settings.background.green }},{{ scheme.settings.background.blue }}; - --color-secondary-button-text: {{ scheme.settings.secondary_button_label.red }},{{ scheme.settings.secondary_button_label.green }},{{ scheme.settings.secondary_button_label.blue }}; - --color-link: {{ scheme.settings.secondary_button_label.red }},{{ scheme.settings.secondary_button_label.green }},{{ scheme.settings.secondary_button_label.blue }}; - --color-badge-foreground: {{ scheme.settings.text.red }},{{ scheme.settings.text.green }},{{ scheme.settings.text.blue }}; - --color-badge-background: {{ scheme.settings.background.red }},{{ scheme.settings.background.green }},{{ scheme.settings.background.blue }}; - --color-badge-border: {{ scheme.settings.text.red }},{{ scheme.settings.text.green }},{{ scheme.settings.text.blue }}; - --payment-terms-background-color: rgb({{ scheme.settings.background.rgb }}); + {% if scheme.settings.background_gradient != empty %} + --gradient-background: {{ scheme.settings.background_gradient }}; + {% else %} + --gradient-background: {{ scheme.settings.background }}; + {% endif %} + --color-foreground: {{ scheme.settings.text.red }},{{ scheme.settings.text.green }},{{ scheme.settings.text.blue }}; + --color-shadow: {{ scheme.settings.shadow.red }},{{ scheme.settings.shadow.green }},{{ scheme.settings.shadow.blue }}; + --color-button: {{ scheme.settings.button.red }},{{ scheme.settings.button.green }},{{ scheme.settings.button.blue }}; + --color-button-text: {{ scheme.settings.button_label.red }},{{ scheme.settings.button_label.green }},{{ scheme.settings.button_label.blue }}; + --color-secondary-button: {{ scheme.settings.background.red }},{{ scheme.settings.background.green }},{{ scheme.settings.background.blue }}; + --color-secondary-button-text: {{ scheme.settings.secondary_button_label.red }},{{ scheme.settings.secondary_button_label.green }},{{ scheme.settings.secondary_button_label.blue }}; + --color-link: {{ scheme.settings.secondary_button_label.red }},{{ scheme.settings.secondary_button_label.green }},{{ scheme.settings.secondary_button_label.blue }}; + --color-badge-foreground: {{ scheme.settings.text.red }},{{ scheme.settings.text.green }},{{ scheme.settings.text.blue }}; + --color-badge-background: {{ scheme.settings.background.red }},{{ scheme.settings.background.green }},{{ scheme.settings.background.blue }}; + --color-badge-border: {{ scheme.settings.text.red }},{{ scheme.settings.text.green }},{{ scheme.settings.text.blue }}; + --payment-terms-background-color: rgb({{ scheme.settings.background.rgb }}); } {% endfor %}