From 54d842f3d51c753e2b9fe3549b97da73942e3d04 Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Tue, 19 Oct 2021 17:15:52 +0100 Subject: [PATCH 01/13] Videomaker: center nav items --- videomaker/assets/theme.css | 8 ++++++++ videomaker/sass/_navigation.scss | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 9b1c314ab4..0e736211bc 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -64,6 +64,14 @@ div.post-meta a { align-items: flex-end; } +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__container { + align-items: center !important; +} + +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item { + align-items: center !important; +} + footer > .wp-block-group { align-items: center; justify-content: space-between; diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 1cbcdd5644..2f10a81596 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -1,4 +1,15 @@ // Needed until this is merged: https://github.com/WordPress/gutenberg/issues/35040 .is-vertical.items-justified-right ul.wp-block-navigation__container { align-items: flex-end; +} + +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive { + &.is-responsive .is-menu-open { + .wp-block-navigation__container { + align-items: center !important; + } + .wp-block-navigation-item { + align-items: center !important; + } + } } \ No newline at end of file From c75b7c5d907f59985f74589b4c687b72e3cba79b Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Tue, 19 Oct 2021 17:18:14 +0100 Subject: [PATCH 02/13] Videomaker: remove uppercase from nav block --- videomaker/child-theme.json | 5 ----- videomaker/theme.json | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/videomaker/child-theme.json b/videomaker/child-theme.json index f01552344b..3be30fa6b2 100644 --- a/videomaker/child-theme.json +++ b/videomaker/child-theme.json @@ -155,11 +155,6 @@ "fontFamily": "var(--wp--preset--font-family--inter)" } }, - "core/navigation": { - "typography": { - "textTransform": "uppercase" - } - }, "core/navigation-link": { "color": { "background": "transparent", diff --git a/videomaker/theme.json b/videomaker/theme.json index 5a7745970e..a22d0b3266 100644 --- a/videomaker/theme.json +++ b/videomaker/theme.json @@ -411,8 +411,7 @@ }, "core/navigation": { "typography": { - "fontSize": "var(--wp--preset--font-size--normal)", - "textTransform": "uppercase" + "fontSize": "var(--wp--preset--font-size--normal)" } }, "core/post-title": { From 96924f51665c0a26c648a4ff5f13e50f57aad9b4 Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Tue, 19 Oct 2021 17:22:59 +0100 Subject: [PATCH 03/13] Videomaker: center social links --- videomaker/assets/theme.css | 3 +++ videomaker/sass/_navigation.scss | 3 +++ 2 files changed, 6 insertions(+) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 0e736211bc..3dbf2ed1b3 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -72,6 +72,9 @@ div.post-meta a { align-items: center !important; } +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open ul.wp-block-social-links { + justify-content: center; +} footer > .wp-block-group { align-items: center; justify-content: space-between; diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 2f10a81596..2f95ab8fa0 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -11,5 +11,8 @@ .wp-block-navigation-item { align-items: center !important; } + ul.wp-block-social-links { + justify-content: center; + } } } \ No newline at end of file From bcde1681fc312c77410bc53b5f118c8b6aba7f8a Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Tue, 19 Oct 2021 17:39:35 +0100 Subject: [PATCH 04/13] Videomaker: add current-menu-item styles --- videomaker/assets/theme.css | 9 +++++++++ videomaker/sass/_navigation.scss | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 3dbf2ed1b3..fb9a4db9b2 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -75,6 +75,15 @@ div.post-meta a { .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open ul.wp-block-social-links { justify-content: center; } + +.wp-block-navigation__container .wp-block-navigation-item.current-menu-item > a { + text-decoration: underline; +} + +.wp-block-navigation__container .wp-block-navigation-item.has-child:not(.current-menu-item) .wp-block-navigation__submenu-container { + display: none; +} + footer > .wp-block-group { align-items: center; justify-content: space-between; diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 2f95ab8fa0..2182beed2b 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -15,4 +15,17 @@ justify-content: center; } } -} \ No newline at end of file +} + +.wp-block-navigation__container { + .wp-block-navigation-item { + &.current-menu-item > a { + text-decoration: underline; + } + &.has-child:not(.current-menu-item) { + .wp-block-navigation__submenu-container { + display: none; + } + } + } +} From fc24bb530423fca2d66ab2b477cbe1d6ac8763c9 Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Wed, 20 Oct 2021 09:23:29 +0100 Subject: [PATCH 05/13] Videomaker: add underline to parent menu item --- videomaker/assets/theme.css | 10 +++------- videomaker/sass/_navigation.scss | 19 +++++-------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index fb9a4db9b2..21c8b27c15 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -72,16 +72,12 @@ div.post-meta a { align-items: center !important; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open ul.wp-block-social-links { - justify-content: center; -} - -.wp-block-navigation__container .wp-block-navigation-item.current-menu-item > a { +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.has-child > a { text-decoration: underline; } -.wp-block-navigation__container .wp-block-navigation-item.has-child:not(.current-menu-item) .wp-block-navigation__submenu-container { - display: none; +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open ul.wp-block-social-links { + justify-content: center; } footer > .wp-block-group { diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 2182beed2b..9b1be1f677 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -10,22 +10,13 @@ } .wp-block-navigation-item { align-items: center !important; + + &.has-child > a { + text-decoration: underline; + } } ul.wp-block-social-links { justify-content: center; } } -} - -.wp-block-navigation__container { - .wp-block-navigation-item { - &.current-menu-item > a { - text-decoration: underline; - } - &.has-child:not(.current-menu-item) { - .wp-block-navigation__submenu-container { - display: none; - } - } - } -} +} \ No newline at end of file From 1560b31552939cb2a65387346b279fcff3640297 Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Wed, 20 Oct 2021 09:48:21 +0100 Subject: [PATCH 06/13] Videomaker: increase nav spacing --- videomaker/assets/theme.css | 6 ++---- videomaker/sass/_navigation.scss | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 21c8b27c15..5785fc794f 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -66,14 +66,12 @@ div.post-meta a { .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__container { align-items: center !important; + row-gap: 1rem !important; } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item { align-items: center !important; -} - -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.has-child > a { - text-decoration: underline; + row-gap: 0.5rem; } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open ul.wp-block-social-links { diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 9b1be1f677..84ecfd2873 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -7,13 +7,11 @@ &.is-responsive .is-menu-open { .wp-block-navigation__container { align-items: center !important; + row-gap: 1rem !important; } .wp-block-navigation-item { align-items: center !important; - - &.has-child > a { - text-decoration: underline; - } + row-gap: 0.5rem; } ul.wp-block-social-links { justify-content: center; From 335c421de8c12fd1b57d312b4c653fb2d97c5a29 Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Wed, 20 Oct 2021 10:23:50 +0100 Subject: [PATCH 07/13] Videomaker: tweak spacing again --- videomaker/assets/theme.css | 8 +++++++- videomaker/sass/_navigation.scss | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 5785fc794f..0580c024f7 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -71,11 +71,17 @@ div.post-meta a { .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item { align-items: center !important; - row-gap: 0.5rem; + row-gap: 0.8rem; +} + + +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__responsive-container-content { + justify-content: space-between; } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open ul.wp-block-social-links { justify-content: center; + padding-bottom: calc( var(--wp--custom--gap--vertical) * 2); } footer > .wp-block-group { diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 84ecfd2873..d478deef58 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -11,10 +11,14 @@ } .wp-block-navigation-item { align-items: center !important; - row-gap: 0.5rem; + row-gap: 0.8rem; + + .wp-block-navigation__responsive-container-content { + justify-content: space-between; } ul.wp-block-social-links { justify-content: center; + padding-bottom: calc( var(--wp--custom--gap--vertical) * 2 ); } } } \ No newline at end of file From 546054cf2f3c359d6404fa7cd0e4c95e99a2baef Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Wed, 20 Oct 2021 10:24:20 +0100 Subject: [PATCH 08/13] Videomaker: style current menu item --- videomaker/assets/theme.css | 7 +++++++ videomaker/sass/_navigation.scss | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 0580c024f7..9042817c67 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -74,6 +74,13 @@ div.post-meta a { row-gap: 0.8rem; } +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.current-menu-item > a { + text-decoration: underline; +} + +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.has-child:not(.current-menu-item) .wp-block-navigation__submenu-container { + display: none; +} .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__responsive-container-content { justify-content: space-between; diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index d478deef58..8341ab1551 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -13,6 +13,15 @@ align-items: center !important; row-gap: 0.8rem; + &.current-menu-item > a { + text-decoration: underline; + } + &.has-child:not(.current-menu-item) { + .wp-block-navigation__submenu-container { + display: none; + } + } + } .wp-block-navigation__responsive-container-content { justify-content: space-between; } From 60a07e272d2c1971c4b6c43d6cc5d0416d193d0f Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Wed, 20 Oct 2021 10:32:33 +0100 Subject: [PATCH 09/13] Videomaker: fix submenu centering --- videomaker/assets/theme.css | 5 +++++ videomaker/sass/_navigation.scss | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 9042817c67..21b261882f 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -78,6 +78,11 @@ div.post-meta a { text-decoration: underline; } +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.has-child .wp-block-navigation__submenu-container { + padding-left: 0 !important; + padding-right: 0; +} + .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.has-child:not(.current-menu-item) .wp-block-navigation__submenu-container { display: none; } diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 8341ab1551..01a8e3b329 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -16,6 +16,12 @@ &.current-menu-item > a { text-decoration: underline; } + &.has-child { + .wp-block-navigation__submenu-container { + padding-left: 0 !important; + padding-right: 0; + } + } &.has-child:not(.current-menu-item) { .wp-block-navigation__submenu-container { display: none; From 6b82343a8de2f5b3e5854a39ad24fe40b0c7a031 Mon Sep 17 00:00:00 2001 From: Sarah Norris Date: Wed, 20 Oct 2021 11:00:25 +0100 Subject: [PATCH 10/13] Videomaker: make all pattern navs uppercase --- videomaker/inc/patterns/background-video.php | 2 +- videomaker/inc/patterns/full-width-homepage.php | 2 +- .../inc/patterns/header-description-and-grid-of-projects.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/videomaker/inc/patterns/background-video.php b/videomaker/inc/patterns/background-video.php index d9ecb6944c..2f1eacbb80 100644 --- a/videomaker/inc/patterns/background-video.php +++ b/videomaker/inc/patterns/background-video.php @@ -17,7 +17,7 @@
- +
diff --git a/videomaker/inc/patterns/full-width-homepage.php b/videomaker/inc/patterns/full-width-homepage.php index 01b1fe52b5..f4dfc1c5b8 100644 --- a/videomaker/inc/patterns/full-width-homepage.php +++ b/videomaker/inc/patterns/full-width-homepage.php @@ -15,7 +15,7 @@ -
+
diff --git a/videomaker/inc/patterns/header-description-and-grid-of-projects.php b/videomaker/inc/patterns/header-description-and-grid-of-projects.php index e1a71624dd..16f950b072 100644 --- a/videomaker/inc/patterns/header-description-and-grid-of-projects.php +++ b/videomaker/inc/patterns/header-description-and-grid-of-projects.php @@ -19,7 +19,7 @@

' . esc_html__( 'Jonah is Creative Director of Hano, a production studio that specializes in combining storytelling with visual design.', 'videomaker' ) . '

- + From 4721cbae982f3593e5b15536c3c967414be35f54 Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Wed, 20 Oct 2021 13:54:35 +0100 Subject: [PATCH 11/13] Blockbase: Remove ! important rules from navigation CSS --- blockbase/assets/ponyfill.css | 14 ++++---- blockbase/block-template-parts/header.html | 2 +- blockbase/sass/blocks/_navigation.scss | 23 ++++++++----- videomaker/assets/theme.css | 22 ++++++------ videomaker/sass/_navigation.scss | 40 ++++++++++++---------- 5 files changed, 55 insertions(+), 46 deletions(-) diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css index e2700da332..783351af5b 100644 --- a/blockbase/assets/ponyfill.css +++ b/blockbase/assets/ponyfill.css @@ -480,22 +480,22 @@ ol { } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__container { - row-gap: 0.5rem !important; - align-items: flex-start !important; + row-gap: 0.5rem; + align-items: flex-start; flex: unset; padding-bottom: 0; } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item { - align-items: flex-start !important; + align-items: flex-start; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__submenu-container { - font-size: var(--wp--preset--font-size--normal) !important; +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__responsive-container-content .has-child .wp-block-navigation__submenu-container { + font-size: var(--wp--preset--font-size--normal); padding-bottom: 0; - padding-left: var(--wp--custom--gap--horizontal) !important; + padding-left: var(--wp--custom--gap--horizontal); padding-top: 0.5rem; - row-gap: 0.5rem !important; + row-gap: 0.5rem; } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open ul.wp-block-social-links { diff --git a/blockbase/block-template-parts/header.html b/blockbase/block-template-parts/header.html index 552ce2ff4f..c36382ce2b 100644 --- a/blockbase/block-template-parts/header.html +++ b/blockbase/block-template-parts/header.html @@ -3,6 +3,6 @@ - + diff --git a/blockbase/sass/blocks/_navigation.scss b/blockbase/sass/blocks/_navigation.scss index e2a7440b9e..8395a92da5 100644 --- a/blockbase/sass/blocks/_navigation.scss +++ b/blockbase/sass/blocks/_navigation.scss @@ -20,22 +20,27 @@ .wp-block-navigation.is-style-blockbase-navigation-improved-responsive { &.is-responsive .is-menu-open { font-size: var(--wp--preset--font-size--medium) !important; + .wp-block-navigation__container { - row-gap: 0.5rem !important; - align-items: flex-start !important; + row-gap: 0.5rem; + align-items: flex-start; flex: unset; padding-bottom: 0; } + .wp-block-navigation-item { - align-items: flex-start !important; + align-items: flex-start; } - .wp-block-navigation__submenu-container { - font-size: var(--wp--preset--font-size--normal) !important; - padding-bottom: 0; - padding-left: var(--wp--custom--gap--horizontal) !important; - padding-top: 0.5rem; - row-gap: 0.5rem !important; + .wp-block-navigation__responsive-container-content .has-child { // Needed for specificity to beat the navigation block CSS + .wp-block-navigation__submenu-container { + font-size: var(--wp--preset--font-size--normal); + padding-bottom: 0; + padding-left: var(--wp--custom--gap--horizontal); + padding-top: 0.5rem; + row-gap: 0.5rem; + } } + ul.wp-block-social-links { justify-content: flex-start; } diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 21b261882f..69ffec87e3 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -64,34 +64,34 @@ div.post-meta a { align-items: flex-end; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__container { - align-items: center !important; - row-gap: 1rem !important; +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__container { + align-items: center; + row-gap: 1rem; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item { - align-items: center !important; +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content .wp-block-navigation-item { + align-items: center; row-gap: 0.8rem; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.current-menu-item > a { +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content .wp-block-navigation-item.current-menu-item > a { text-decoration: underline; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.has-child .wp-block-navigation__submenu-container { - padding-left: 0 !important; +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content .wp-block-navigation-item.has-child .wp-block-navigation__submenu-container { + padding-left: 0; padding-right: 0; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation-item.has-child:not(.current-menu-item) .wp-block-navigation__submenu-container { +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content .wp-block-navigation-item.has-child:not(.current-menu-item) .wp-block-navigation__submenu-container { display: none; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__responsive-container-content { +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content { justify-content: space-between; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open ul.wp-block-social-links { +.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container ul.wp-block-social-links { justify-content: center; padding-bottom: calc( var(--wp--custom--gap--vertical) * 2); } diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 01a8e3b329..4a3cdf7d9c 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -4,27 +4,31 @@ } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive { - &.is-responsive .is-menu-open { + &.is-responsive .is-menu-open.wp-block-navigation__responsive-container { .wp-block-navigation__container { - align-items: center !important; - row-gap: 1rem !important; + align-items: center; + row-gap: 1rem; } - .wp-block-navigation-item { - align-items: center !important; - row-gap: 0.8rem; - &.current-menu-item > a { - text-decoration: underline; - } - &.has-child { - .wp-block-navigation__submenu-container { - padding-left: 0 !important; - padding-right: 0; + .wp-block-navigation__responsive-container-content { // Needed for specificity to beat the navigation block CSS + .wp-block-navigation-item { + align-items: center; + row-gap: 0.8rem; + + &.current-menu-item > a { + text-decoration: underline; } - } - &.has-child:not(.current-menu-item) { - .wp-block-navigation__submenu-container { - display: none; + + &.has-child { + .wp-block-navigation__submenu-container { + padding-left: 0; + padding-right: 0; + } + } + &.has-child:not(.current-menu-item) { + .wp-block-navigation__submenu-container { + display: none; + } } } } @@ -36,4 +40,4 @@ padding-bottom: calc( var(--wp--custom--gap--vertical) * 2 ); } } -} \ No newline at end of file +} From 969a84a72f17a09d0cee1047c513209446532166 Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Wed, 20 Oct 2021 13:56:47 +0100 Subject: [PATCH 12/13] Always show submenu items --- videomaker/assets/theme.css | 4 ---- videomaker/sass/_navigation.scss | 5 ----- 2 files changed, 9 deletions(-) diff --git a/videomaker/assets/theme.css b/videomaker/assets/theme.css index 69ffec87e3..5515634c55 100644 --- a/videomaker/assets/theme.css +++ b/videomaker/assets/theme.css @@ -83,10 +83,6 @@ div.post-meta a { padding-right: 0; } -.wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content .wp-block-navigation-item.has-child:not(.current-menu-item) .wp-block-navigation__submenu-container { - display: none; -} - .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open.wp-block-navigation__responsive-container .wp-block-navigation__responsive-container-content { justify-content: space-between; } diff --git a/videomaker/sass/_navigation.scss b/videomaker/sass/_navigation.scss index 4a3cdf7d9c..a21279f763 100644 --- a/videomaker/sass/_navigation.scss +++ b/videomaker/sass/_navigation.scss @@ -25,11 +25,6 @@ padding-right: 0; } } - &.has-child:not(.current-menu-item) { - .wp-block-navigation__submenu-container { - display: none; - } - } } } .wp-block-navigation__responsive-container-content { From 479f7a616c71d8eb1b548cc149814ae53ea2a7b5 Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Wed, 20 Oct 2021 14:00:41 +0100 Subject: [PATCH 13/13] Remove another ! important --- blockbase/assets/ponyfill.css | 2 +- blockbase/sass/blocks/_navigation.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css index 783351af5b..c0292d6430 100644 --- a/blockbase/assets/ponyfill.css +++ b/blockbase/assets/ponyfill.css @@ -476,7 +476,7 @@ ol { } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open { - font-size: var(--wp--preset--font-size--medium) !important; + font-size: var(--wp--preset--font-size--medium); } .wp-block-navigation.is-style-blockbase-navigation-improved-responsive.is-responsive .is-menu-open .wp-block-navigation__container { diff --git a/blockbase/sass/blocks/_navigation.scss b/blockbase/sass/blocks/_navigation.scss index 8395a92da5..afef282dfa 100644 --- a/blockbase/sass/blocks/_navigation.scss +++ b/blockbase/sass/blocks/_navigation.scss @@ -19,7 +19,7 @@ .wp-block-navigation.is-style-blockbase-navigation-improved-responsive { &.is-responsive .is-menu-open { - font-size: var(--wp--preset--font-size--medium) !important; + font-size: var(--wp--preset--font-size--medium); .wp-block-navigation__container { row-gap: 0.5rem;