From c5078b4327efb529aeae239b4a29167f0fbded4a Mon Sep 17 00:00:00 2001 From: bj-anas <93322743+bj-anas@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:22:29 +0100 Subject: [PATCH 1/3] fixing aura theme --- themes/aura/assets/desktop-slider.css | 12 +++++++----- themes/aura/assets/main.css | 3 --- themes/aura/assets/mobile-slider.css | 6 +++--- themes/aura/sections/main-page.liquid | 2 +- themes/aura/snippets/breadcrumbs.liquid | 4 ++-- themes/aura/styles/desktop-slider.scss | 9 ++------- themes/aura/styles/main.scss | 6 ------ 7 files changed, 15 insertions(+), 27 deletions(-) diff --git a/themes/aura/assets/desktop-slider.css b/themes/aura/assets/desktop-slider.css index ed483b28..3708d115 100644 --- a/themes/aura/assets/desktop-slider.css +++ b/themes/aura/assets/desktop-slider.css @@ -18,14 +18,16 @@ .splide{ height:var(--mobile-height); } +@media (min-width: 768px){ + .splide{ + height:var(--desktop-height); + } +} .yc-slider__desktop{ display:none; } @media (min-width: 768px){ - .splide{ - height:var(--desktop-height); - } .yc-slider__desktop{ display:block; } @@ -55,10 +57,10 @@ .yc-slider__desktop .content p{ margin-top:1rem; } -.yc-slider__desktop .content .btn-holder { +.yc-slider__desktop .content .btn-holder{ margin-top:1em; text-align:var(--alignment); } -.yc-slider__desktop .content .btn-holder a { +.yc-slider__desktop .content .btn-holder a{ display:inline-flex; } diff --git a/themes/aura/assets/main.css b/themes/aura/assets/main.css index 84002b52..38568456 100644 --- a/themes/aura/assets/main.css +++ b/themes/aura/assets/main.css @@ -615,9 +615,6 @@ textarea{ .breadcrumbs-container .breadcrumbs-listings .third-listing{ font-weight:800; } -[dir=ltr] .breadcrumbs-container .breadcrumbs-listings .arrow{ - rotate:180deg; -} .breadcrumbs-container .breadcrumbs-name{ font-weight:700; font-size:26px; diff --git a/themes/aura/assets/mobile-slider.css b/themes/aura/assets/mobile-slider.css index 5654be88..84124d15 100644 --- a/themes/aura/assets/mobile-slider.css +++ b/themes/aura/assets/mobile-slider.css @@ -7,7 +7,7 @@ height:100%; display:flex; justify-content:center; - flex-direction: column; + flex-direction:column; padding:0 20px; text-align:var(--alignment); } @@ -28,10 +28,10 @@ .yc-slider__mobile .content p{ margin-top:1rem; } -.yc-slider__desktop .content .btn-holder { +.yc-slider__mobile .content .btn-holder{ margin-top:1em; text-align:var(--alignment); } -.yc-slider__desktop .content .btn-holder a { +.yc-slider__mobile .content .btn-holder a{ display:inline-flex; } diff --git a/themes/aura/sections/main-page.liquid b/themes/aura/sections/main-page.liquid index a26aa5dd..3b096355 100644 --- a/themes/aura/sections/main-page.liquid +++ b/themes/aura/sections/main-page.liquid @@ -6,7 +6,7 @@
{{ 'snippets.collection-listing.home' | t }}
-
+
diff --git a/themes/aura/snippets/breadcrumbs.liquid b/themes/aura/snippets/breadcrumbs.liquid index e3d90c94..2af9c90c 100644 --- a/themes/aura/snippets/breadcrumbs.liquid +++ b/themes/aura/snippets/breadcrumbs.liquid @@ -4,7 +4,7 @@ {{ 'snippets.collection-listing.home' | t }}
{%- if template contains 'collection' or template contains 'list-collections' -%} -
+
@@ -12,7 +12,7 @@
{% endif %} {% if category %} -
+
diff --git a/themes/aura/styles/desktop-slider.scss b/themes/aura/styles/desktop-slider.scss index 4be74f6e..7b0de16a 100644 --- a/themes/aura/styles/desktop-slider.scss +++ b/themes/aura/styles/desktop-slider.scss @@ -17,7 +17,7 @@ .splide { height: var(--mobile-height); - + @include breakpoint('md') { height: var(--desktop-height); } @@ -58,15 +58,10 @@ .btn-holder { margin-top: 1em; text-align: var(--alignment); + a { display: inline-flex; } } - - .container { - & > div { - max-width: 600px; - } - } } } diff --git a/themes/aura/styles/main.scss b/themes/aura/styles/main.scss index e0b2e0f9..c34edd10 100644 --- a/themes/aura/styles/main.scss +++ b/themes/aura/styles/main.scss @@ -698,12 +698,6 @@ textarea { .third-listing { font-weight: 800; } - - .arrow { - [dir='ltr'] & { - rotate: 180deg; - } - } } .breadcrumbs-name { From 6208be5fe55c945a5fe4715ff57f8eeddc12b1c1 Mon Sep 17 00:00:00 2001 From: bj-anas <93322743+bj-anas@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:24:25 +0100 Subject: [PATCH 2/3] fixing harmony --- themes/harmony/assets/desktop-slider.css | 5 +++-- themes/harmony/assets/main.css | 3 --- themes/harmony/assets/mobile-slider.css | 7 ++++--- themes/harmony/assets/navbar.css | 2 +- themes/harmony/snippets/breadcrumbs.liquid | 8 ++++---- themes/harmony/styles/desktop-slider.scss | 11 +++-------- themes/harmony/styles/main.scss | 6 ------ themes/harmony/styles/mobile-slider.scss | 1 + 8 files changed, 16 insertions(+), 27 deletions(-) diff --git a/themes/harmony/assets/desktop-slider.css b/themes/harmony/assets/desktop-slider.css index e6227bc5..86c6a857 100644 --- a/themes/harmony/assets/desktop-slider.css +++ b/themes/harmony/assets/desktop-slider.css @@ -43,6 +43,7 @@ .yc-slider__desktop .content .headers, .yc-slider__desktop .content h3, .yc-slider__desktop .content h2, .yc-slider__desktop .content h1{ font-weight:700; line-height:1.2; + margin-bottom:2rem; } .yc-slider__desktop .content h1{ font-size:3rem; @@ -56,10 +57,10 @@ .yc-slider__desktop .content p{ margin-top:1rem; } -.yc-slider__desktop .content .btn-holder { +.yc-slider__desktop .content .btn-holder{ margin-top:1em; text-align:var(--alignment); } -.yc-slider__desktop .content .btn-holder a { +.yc-slider__desktop .content .btn-holder a{ display:inline-flex; } diff --git a/themes/harmony/assets/main.css b/themes/harmony/assets/main.css index 97937321..7dd589e6 100644 --- a/themes/harmony/assets/main.css +++ b/themes/harmony/assets/main.css @@ -638,9 +638,6 @@ textarea{ color:#000000; font-weight:600; } -[dir=ltr] .breadcrumbs-container .breadcrumbs-listings .arrow{ - rotate:180deg; -} .breadcrumbs-container .breadcrumbs-name{ font-weight:400; font-size:24px; diff --git a/themes/harmony/assets/mobile-slider.css b/themes/harmony/assets/mobile-slider.css index ac9d9714..84124d15 100644 --- a/themes/harmony/assets/mobile-slider.css +++ b/themes/harmony/assets/mobile-slider.css @@ -7,13 +7,14 @@ height:100%; display:flex; justify-content:center; - flex-direction: column; + flex-direction:column; padding:0 20px; text-align:var(--alignment); } .yc-slider__mobile .content .headers, .yc-slider__mobile .content h3, .yc-slider__mobile .content h2, .yc-slider__mobile .content h1{ font-weight:700; line-height:1.2; + margin-bottom:2rem; } .yc-slider__mobile .content h1{ font-size:3rem; @@ -27,10 +28,10 @@ .yc-slider__mobile .content p{ margin-top:1rem; } -.yc-slider__desktop .content .btn-holder { +.yc-slider__mobile .content .btn-holder{ margin-top:1em; text-align:var(--alignment); } -.yc-slider__desktop .content .btn-holder a { +.yc-slider__mobile .content .btn-holder a{ display:inline-flex; } diff --git a/themes/harmony/assets/navbar.css b/themes/harmony/assets/navbar.css index 977f4cc4..e995cd7f 100644 --- a/themes/harmony/assets/navbar.css +++ b/themes/harmony/assets/navbar.css @@ -97,7 +97,7 @@ } } .yc-header .yc-navbar .logo img{ - width: 100%; + width:100%; max-width:110px; max-height:70px; } diff --git a/themes/harmony/snippets/breadcrumbs.liquid b/themes/harmony/snippets/breadcrumbs.liquid index 3f3ae627..2cce36af 100644 --- a/themes/harmony/snippets/breadcrumbs.liquid +++ b/themes/harmony/snippets/breadcrumbs.liquid @@ -4,7 +4,7 @@ {{ 'snippets.collection-listing.home' | t }}
{%- if template contains 'collection' or template contains 'list-collections' -%} -
+
@@ -12,7 +12,7 @@
{% endif %} {% if category %} -
+
@@ -20,7 +20,7 @@
{%- endif -%} {%- if template contains 'cart' -%} -
+
@@ -28,7 +28,7 @@
{% endif %} {% if template contains 'page' %} -
+
diff --git a/themes/harmony/styles/desktop-slider.scss b/themes/harmony/styles/desktop-slider.scss index 9b269b32..5f3e35fd 100644 --- a/themes/harmony/styles/desktop-slider.scss +++ b/themes/harmony/styles/desktop-slider.scss @@ -2,11 +2,11 @@ .splide { height: var(--mobile-height); - + @include breakpoint('md') { height: var(--desktop-height); } - + .splide__arrow { margin: 0 100px; } @@ -64,15 +64,10 @@ .btn-holder { margin-top: 1em; text-align: var(--alignment); + a { display: inline-flex; } } - - .container { - & > div { - max-width: 600px; - } - } } } diff --git a/themes/harmony/styles/main.scss b/themes/harmony/styles/main.scss index 47c64c35..242ee795 100644 --- a/themes/harmony/styles/main.scss +++ b/themes/harmony/styles/main.scss @@ -723,12 +723,6 @@ textarea { font-weight: 600; } } - - .arrow { - [dir='ltr'] & { - rotate: 180deg; - } - } } .breadcrumbs-name { diff --git a/themes/harmony/styles/mobile-slider.scss b/themes/harmony/styles/mobile-slider.scss index c805f83b..18c98f16 100644 --- a/themes/harmony/styles/mobile-slider.scss +++ b/themes/harmony/styles/mobile-slider.scss @@ -33,6 +33,7 @@ .btn-holder { margin-top:1em; text-align:var(--alignment); + a { display: inline-flex; } From d2857fee112572672c34d10f7c8d76d65753a9a0 Mon Sep 17 00:00:00 2001 From: bj-anas <93322743+bj-anas@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:33:36 +0100 Subject: [PATCH 3/3] fixing meraki --- themes/meraki/assets/main.css | 3 --- themes/meraki/assets/mobile-slider.css | 1 - themes/meraki/config/settings_schema.json | 2 +- themes/meraki/sections/main-page.liquid | 2 +- themes/meraki/snippets/breadcrumbs.liquid | 4 ++-- themes/meraki/styles/desktop-slider.scss | 11 +++-------- themes/meraki/styles/main.scss | 6 ------ themes/meraki/styles/mobile-slider.scss | 3 ++- 8 files changed, 9 insertions(+), 23 deletions(-) diff --git a/themes/meraki/assets/main.css b/themes/meraki/assets/main.css index 1f9e10e0..84a9d51d 100644 --- a/themes/meraki/assets/main.css +++ b/themes/meraki/assets/main.css @@ -654,9 +654,6 @@ textarea{ .breadcrumbs-container .breadcrumbs-listings .arrow-item{ color:#9C9C9C; } -[dir=ltr] .breadcrumbs-container .breadcrumbs-listings .arrow{ - rotate:180deg; -} .breadcrumbs-container .breadcrumbs-name{ font-weight:700; font-size:26px; diff --git a/themes/meraki/assets/mobile-slider.css b/themes/meraki/assets/mobile-slider.css index b58bf4a6..14fae60a 100644 --- a/themes/meraki/assets/mobile-slider.css +++ b/themes/meraki/assets/mobile-slider.css @@ -26,7 +26,6 @@ .yc-slider__mobile .content .btn-holder{ text-align:var(--alignment); } - .yc-slider__mobile .content .btn-holder a{ display:inline-flex; } diff --git a/themes/meraki/config/settings_schema.json b/themes/meraki/config/settings_schema.json index d55341cb..f259512b 100644 --- a/themes/meraki/config/settings_schema.json +++ b/themes/meraki/config/settings_schema.json @@ -24,7 +24,7 @@ }, { "value": "ltr", - "label": "left to right" + "label": "Left to right" } ], "default": "rtl" diff --git a/themes/meraki/sections/main-page.liquid b/themes/meraki/sections/main-page.liquid index 3b096355..f72eb804 100644 --- a/themes/meraki/sections/main-page.liquid +++ b/themes/meraki/sections/main-page.liquid @@ -7,7 +7,7 @@ {{ 'snippets.collection-listing.home' | t }}
- + /
{{ page.name }} diff --git a/themes/meraki/snippets/breadcrumbs.liquid b/themes/meraki/snippets/breadcrumbs.liquid index 42d78300..fc6d923a 100644 --- a/themes/meraki/snippets/breadcrumbs.liquid +++ b/themes/meraki/snippets/breadcrumbs.liquid @@ -12,11 +12,11 @@
{% endif %} {% if category %} -
+
/
- {{ category.name}} + {{ category.name }}
{%- endif -%}
diff --git a/themes/meraki/styles/desktop-slider.scss b/themes/meraki/styles/desktop-slider.scss index 212c8832..b97ab748 100644 --- a/themes/meraki/styles/desktop-slider.scss +++ b/themes/meraki/styles/desktop-slider.scss @@ -2,7 +2,7 @@ .splide { height: var(--mobile-height); - + @include breakpoint('md') { height: var(--desktop-height); } @@ -77,13 +77,8 @@ .btn-holder { text-align:var(--alignment); - .yc-btn-slider { - font-size: 14px; - background-color: var(--yc-primary-color) !important; - color: #ffffff; - margin-top: 38px; - padding: 12px 18px; - display:inline-flex; + a { + display:inline-flex; } } } diff --git a/themes/meraki/styles/main.scss b/themes/meraki/styles/main.scss index b6a09f2b..3213ade6 100644 --- a/themes/meraki/styles/main.scss +++ b/themes/meraki/styles/main.scss @@ -738,12 +738,6 @@ textarea { .arrow-item { color: #9C9C9C; } - - .arrow { - [dir='ltr'] & { - rotate: 180deg; - } - } } .breadcrumbs-name { diff --git a/themes/meraki/styles/mobile-slider.scss b/themes/meraki/styles/mobile-slider.scss index e3614fb6..64ec68c0 100644 --- a/themes/meraki/styles/mobile-slider.scss +++ b/themes/meraki/styles/mobile-slider.scss @@ -30,7 +30,8 @@ .btn-holder { text-align: var(--alignment); - .yc-btn-slider { + + a { display: inline-flex; } }