From b155d5ae8303b06e000eb663c7317ddbae8b43db Mon Sep 17 00:00:00 2001 From: devwael Date: Mon, 15 Sep 2025 21:56:50 +0300 Subject: [PATCH 1/6] Add selectors for wordpress.org nav menu --- .../components/navigation/_navigation.scss | 101 +++++++++++++----- 1 file changed, 76 insertions(+), 25 deletions(-) diff --git a/assets/sass/components/navigation/_navigation.scss b/assets/sass/components/navigation/_navigation.scss index 9b5f3c63..6ef28360 100644 --- a/assets/sass/components/navigation/_navigation.scss +++ b/assets/sass/components/navigation/_navigation.scss @@ -5,7 +5,8 @@ width: 100%; &.main-navigation { - > div#primary-menu { + > div#primary-menu, + > div { > ul { list-style: none; padding: 0; @@ -15,7 +16,8 @@ @media(min-width: 1025px) { &.main-navigation { - > div#primary-menu { + > div#primary-menu, + > div { > ul { display: flex; flex-wrap: wrap; @@ -28,12 +30,15 @@ } } - .botiga-dropdown-ul { + .botiga-dropdown-ul, + .nav-menu { list-style: none; margin: 0; padding-left: 0; - .botiga-dropdown-ul { + .botiga-dropdown-ul, + .children, + .sub-menu { width: 200px; box-shadow: 0 0 15px rgba(0,0,0,.1); float: left; @@ -47,12 +52,16 @@ transform: translate3d(0, 15px, 0); transition: ease transform 300ms, ease opacity 300ms; - .botiga-dropdown-ul { + .botiga-dropdown-ul, + .children, + .sub-menu { left: 100%; top: 0; } - .botiga-dropdown-li { + .botiga-dropdown-li, + .page_item, + .menu-item { background: #fff; padding: 0; display: flex; @@ -60,7 +69,13 @@ &.hovered > .botiga-dropdown-ul, &:hover > .botiga-dropdown-ul, - &.focus > .botiga-dropdown-ul { + &.focus > .botiga-dropdown-ul, + &.hovered > .children, + &:hover > .children, + &.focus > .children, + &.hovered > .sub-menu, + &:hover > .sub-menu, + &.focus > .sub-menu { display: block; left: 100%; } @@ -81,7 +96,9 @@ } } - .botiga-dropdown-link { + .botiga-dropdown-link, + .page_item a, + .menu-item a { width: 100%; display: inline-block; text-transform: none; @@ -91,7 +108,13 @@ .botiga-dropdown-li.hovered > .botiga-dropdown-ul, .botiga-dropdown-li:hover > .botiga-dropdown-ul, - .botiga-dropdown-li.focus > .botiga-dropdown-ul { + .botiga-dropdown-li.focus > .botiga-dropdown-ul, + .page_item.hovered > .children, + .page_item:hover > .children, + .page_item.focus > .children, + .menu-item.hovered > .sub-menu, + .menu-item:hover > .sub-menu, + .menu-item.focus > .sub-menu { left: auto; top: 100%; opacity: 1; @@ -109,7 +132,9 @@ bottom: 100%; } - .botiga-dropdown-ul { + .botiga-dropdown-ul, + .children, + .sub-menu { top: 0; &.sub-menu-reverse { @@ -125,7 +150,9 @@ } } - .botiga-dropdown-li { + .botiga-dropdown-li, + .page_item, + .menu-item { position: relative; margin-right: 35px; padding-bottom: 0; @@ -135,7 +162,9 @@ } } - .botiga-dropdown-link { + .botiga-dropdown-link, + .page_item a, + .menu-item a { padding: 10px 0; display: inline-block; text-decoration: none; @@ -152,14 +181,24 @@ } &.with-hover-delay { - .botiga-dropdown-ul { - .botiga-dropdown-ul { + .botiga-dropdown-ul, + .children, + .sub-menu { + .botiga-dropdown-ul, + .children, + .sub-menu { transition-delay: 0ms; } .botiga-dropdown-li.hovered > .botiga-dropdown-ul, .botiga-dropdown-li:hover > .botiga-dropdown-ul, - .botiga-dropdown-li.focus > .botiga-dropdown-ul { + .botiga-dropdown-li.focus > .botiga-dropdown-ul, + .page_item.hovered > .children, + .page_item:hover > .children, + .page_item.focus > .children, + .menu-item.hovered > .sub-menu, + .menu-item:hover > .sub-menu, + .menu-item.focus > .sub-menu { transition-delay: 300ms; } } @@ -169,17 +208,22 @@ @media(max-width: 1024px) { &.botiga-dropdown-mobile-accordion { - .botiga-dropdown-li { + .botiga-dropdown-li, + .page_item, + .menu-item { margin-right: 0; - &.menu-item-has-children { + &.menu-item-has-children, + &.page_item_has_children { display: flex; flex-wrap: wrap; - > .botiga-dropdown-link { + > .botiga-dropdown-link, + > a { width: calc( 100% - ( var(--dropdown--symbol--size) + 0.5em ) ); } - > .sub-menu { + > .sub-menu, + > .children { position: relative; width: 100%; left: 0; @@ -188,17 +232,21 @@ transform: none; box-shadow: none; - > .botiga-dropdown-li { + > .botiga-dropdown-li, + > .page_item, + > .menu-item { background-color: transparent; } - .sub-menu { + .sub-menu, + .children { padding-left: 20px; } } &.expand { - > .sub-menu { + > .sub-menu, + > .children { opacity: 1; height: auto; overflow: visible; @@ -206,7 +254,8 @@ } &:not(.expand) { - > .sub-menu { + > .sub-menu, + > .children { opacity: 0; height: 0; overflow: hidden; @@ -243,12 +292,14 @@ } /* Small menu. */ -.botiga-dropdown.toggled .botiga-dropdown-ul { +.botiga-dropdown.toggled .botiga-dropdown-ul, +.botiga-dropdown.toggled .nav-menu { display: block; } @media screen and (min-width: 1025px) { - .botiga-dropdown .botiga-dropdown-ul { + .botiga-dropdown .botiga-dropdown-ul, + .botiga-dropdown .nav-menu { display: flex; flex-wrap: wrap; } From 06fda3cbd787250f069a3b57731b328b6d2402f9 Mon Sep 17 00:00:00 2001 From: devwael Date: Mon, 15 Sep 2025 22:39:28 +0300 Subject: [PATCH 2/6] Adjust selectors --- assets/sass/components/navigation/_navigation.scss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/assets/sass/components/navigation/_navigation.scss b/assets/sass/components/navigation/_navigation.scss index 6ef28360..caa449ea 100644 --- a/assets/sass/components/navigation/_navigation.scss +++ b/assets/sass/components/navigation/_navigation.scss @@ -5,8 +5,7 @@ width: 100%; &.main-navigation { - > div#primary-menu, - > div { + > div#primary-menu { > ul { list-style: none; padding: 0; @@ -16,14 +15,13 @@ @media(min-width: 1025px) { &.main-navigation { - > div#primary-menu, - > div { + > div#primary-menu { > ul { display: flex; flex-wrap: wrap; li + li { - margin-left: 35px; + //margin-left: 35px; } } } From 74ba9c77484a4fa8f73a7e9b6718ab157d5f2bcc Mon Sep 17 00:00:00 2001 From: devwael Date: Mon, 15 Sep 2025 23:00:15 +0300 Subject: [PATCH 3/6] Adjust selectors for WP fallback if no menus assigned --- assets/sass/components/navigation/_navigation.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/sass/components/navigation/_navigation.scss b/assets/sass/components/navigation/_navigation.scss index caa449ea..3b4780c4 100644 --- a/assets/sass/components/navigation/_navigation.scss +++ b/assets/sass/components/navigation/_navigation.scss @@ -20,8 +20,8 @@ display: flex; flex-wrap: wrap; - li + li { - //margin-left: 35px; + > li + li { + margin-left: 35px; } } } From ef80cd8761b432c0427fb526e3e11695516632d0 Mon Sep 17 00:00:00 2001 From: devwael Date: Mon, 15 Sep 2025 23:09:15 +0300 Subject: [PATCH 4/6] Fix access to the parent triggers security error "CORS" in wordpress.org preview --- assets/js/src/custom.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/src/custom.js b/assets/js/src/custom.js index cf601f5c..1c7b19d4 100644 --- a/assets/js/src/custom.js +++ b/assets/js/src/custom.js @@ -1813,16 +1813,16 @@ botiga.misc = { } }, customizer: function() { - if( ! window.parent.document.body.classList.contains( 'wp-customizer' ) ) { + if ( typeof wp === 'undefined' || typeof wp.customize === 'undefined' ) { return false; } - window.onload = function() { + wp.customize.bind( 'preview-ready', function() { var cart_count = document.querySelectorAll( '.cart-count' ); if( cart_count.length ) { jQuery( document.body ).trigger( 'wc_fragment_refresh' ); } - } + } ); } } From fcf637dfe315d86823d578f30ae4fca29bd46241 Mon Sep 17 00:00:00 2001 From: devwael Date: Tue, 16 Sep 2025 00:32:07 +0300 Subject: [PATCH 5/6] Fix the search form default color --- assets/sass/abstracts/variables/_colors.scss | 1 + assets/sass/base/elements/_body.scss | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/assets/sass/abstracts/variables/_colors.scss b/assets/sass/abstracts/variables/_colors.scss index 8ccdc5ed..71fb3d64 100644 --- a/assets/sass/abstracts/variables/_colors.scss +++ b/assets/sass/abstracts/variables/_colors.scss @@ -20,5 +20,6 @@ $color__border-input: #ccc; $color__border-abbr: #666; $color__primary: #212121; +$color__white: #ffffff; $color__grey: #666666; $color__hover: #757575; \ No newline at end of file diff --git a/assets/sass/base/elements/_body.scss b/assets/sass/base/elements/_body.scss index b8948150..a9983e8d 100644 --- a/assets/sass/base/elements/_body.scss +++ b/assets/sass/base/elements/_body.scss @@ -32,5 +32,11 @@ body { .ws-svg-icon { width: 24px; height: 24px; + + svg { + &:not(.stroke-based) { + fill: $color__white; + } + } } } \ No newline at end of file From 1bc1f87ffe82407e749e2c6b825761b211ccbbc9 Mon Sep 17 00:00:00 2001 From: devwael Date: Tue, 16 Sep 2025 01:06:57 +0300 Subject: [PATCH 6/6] Fix the search form default color --- assets/sass/base/elements/_body.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/sass/base/elements/_body.scss b/assets/sass/base/elements/_body.scss index a9983e8d..f224a2e0 100644 --- a/assets/sass/base/elements/_body.scss +++ b/assets/sass/base/elements/_body.scss @@ -35,7 +35,7 @@ body { svg { &:not(.stroke-based) { - fill: $color__white; + fill: $color__white; // change the default color to white } } }