From 7d33e68f184740307dd4bd37b52753cd508fe714 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Wed, 24 Jan 2018 16:17:03 -0500 Subject: [PATCH] adding column checks for the top bar nav setting up 3 columns for menu items that have a lot of children --- assets/stylesheets/glm-dev.css | 2 +- assets/stylesheets/glm-dev.css.map | 2 +- glm-dev/js/glm-dev.js | 2 +- glm-dev/scss/_body.scss | 5 +++++ glm-dev/scss/_header.scss | 35 ++++++++++++++++++++++++++++-- inc/menu-walker.php | 27 +++++++++++++++++++++-- 6 files changed, 66 insertions(+), 7 deletions(-) diff --git a/assets/stylesheets/glm-dev.css b/assets/stylesheets/glm-dev.css index 38c47d4..a2c3ac0 100644 --- a/assets/stylesheets/glm-dev.css +++ b/assets/stylesheets/glm-dev.css @@ -1,3 +1,3 @@ -.top-menu-left{height:28px}.top-menu-left .top-bar{height:28px;padding:0;float:right;background-color:#156c96}.top-menu-left .top-bar .top-bar-section ul.dropdown.menu .menu-item a{padding:.55rem 9px;font-size:11px;color:#74a8c1;background-color:#156c96}.top-menu-left .top-bar .top-bar-section ul.dropdown.menu .menu-item a:hover{background-color:#74a8c1;color:#fff}#top-menu-right .top-bar{padding:0px;background-color:#fff;float:right;margin-right:30px}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item ul.submenu{background:#333;border:none}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item ul.submenu li.menu-item a{background-color:#333;color:#fff}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item>a{padding:2rem 10px;font-family:inherit;font-size:12px;font-weight:400;color:#9a9a9a;background-color:#fff}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item>a:hover{background-color:#333;color:#fff}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item>a::after{display:none}.search-button{right:0;top:-3px}.header-logo{float:left;margin-top:12px}.header-logo img{max-width:270px}.off-canvas-content .off-canvas.position-left.is-transition-overlap{z-index:99999999}.off-canvas-content .off-canvas.position-right.is-transition-overlap{z-index:99999999}.title-bar{background-color:#fff}.title-bar .menu-icon{background:transparent;background-color:transparent;box-shadow:none;border-color:transparent}.title-bar .menu-icon::after{background:#9a9a9a;box-shadow:0 7px 0 #9a9a9a,0 14px 0 #9a9a9a}.title-bar .header-logo{margin:0 auto;float:none}.title-bar .header-logo img{max-height:30px} +.top-menu-left{height:28px}.top-menu-left .top-bar{height:28px;padding:0;float:right;background-color:#156c96}.top-menu-left .top-bar .top-bar-section ul.dropdown.menu .menu-item>a{padding:.55rem 9px;font-size:11px;color:#74a8c1;background-color:#156c96}.top-menu-left .top-bar .top-bar-section ul.dropdown.menu .menu-item>a:hover{background-color:#74a8c1;color:#fff}.top-menu-left .top-bar .top-bar-section ul.dropdown.menu .menu-item>a::after{display:none}#top-menu-right .top-bar{padding:0px;background-color:#fff;float:right;margin-right:30px}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu{min-width:415px;-webkit-column-count:3;-moz-column-count:3;column-count:3}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item ul.submenu{background:#333;border:none;min-width:415px;padding:10px 10px 10px 250px}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item ul.submenu .three-col{-webkit-column-count:3;-moz-column-count:3;column-count:3}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item ul.submenu li.menu-item{overflow:hidden;break-inside:avoid-column;-webkit-column-break-inside:avoid;text-align:left}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item ul.submenu li.menu-item a{background-color:#333;color:#fff;padding:5px}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item ul.submenu li.menu-item a:hover{background-color:#9a9a9a;background:#9a9a9a}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item>a{padding:2rem 10px;font-family:inherit;font-size:12px;font-weight:400;color:#9a9a9a;background-color:#fff}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item>a:hover{background-color:#333;color:#fff}#top-menu-right .top-bar .top-bar-section ul.dropdown.menu .menu-item>a::after{display:none}#top-menu-right .dropdown-image ul.submenu{min-height:125px}.search-button{right:0;top:-3px}.header-logo{float:left;margin-top:12px}.header-logo img{max-width:270px}body .js-off-canvas-overlay.is-overlay-fixed{z-index:99999}.off-canvas-content .off-canvas.position-left.is-transition-overlap{z-index:99999999}.off-canvas-content .off-canvas.position-right.is-transition-overlap{z-index:99999999}.title-bar{background-color:#fff}.title-bar .menu-icon{background:transparent;background-color:transparent;box-shadow:none;border-color:transparent}.title-bar .menu-icon::after{background:#9a9a9a;box-shadow:0 7px 0 #9a9a9a,0 14px 0 #9a9a9a}.title-bar .header-logo{margin:0 auto;float:none}.title-bar .header-logo img{max-height:30px} /*# sourceMappingURL=glm-dev.css.map */ diff --git a/assets/stylesheets/glm-dev.css.map b/assets/stylesheets/glm-dev.css.map index 2e4159b..19a4827 100644 --- a/assets/stylesheets/glm-dev.css.map +++ b/assets/stylesheets/glm-dev.css.map @@ -1 +1 @@ -{"version":3,"file":"glm-dev.css","sources":["glm-dev.scss","_global-settings.scss","_header.scss","_body.scss","_footer.scss","_off-canvas.scss"],"sourcesContent":["@import 'global-settings';\n@import 'header';\n@import 'body';\n@import 'footer';\n@import 'off-canvas';","$l-blue : #74a8c1;\n$blue : #156c96;\n$white : white;\n$grey : #9a9a9a;\n$oil : #333;",".top-menu-left{\n height: 28px;\n .top-bar{\n height: 28px;\n padding: 0;\n float: right;\n background-color: $blue;\n .top-bar-section{\n ul.dropdown.menu{\n .menu-item{\n a{\n padding: .55rem 9px;\n font-size: 11px;\n color: $l-blue;\n background-color: $blue;\n &:hover{\n background-color: $l-blue;\n color: $white;\n }\n }\n }\n }\n }\n }\n}\n#top-menu-right{\n .top-bar{\n padding: 0px;\n background-color: $white;\n float: right;\n margin-right: 30px;\n .top-bar-section{\n ul.dropdown.menu{\n \n .menu-item{\n ul.submenu{\n background: $oil;\n border: none;\n \n li.menu-item{\n a{\n background-color: $oil;\n color: $white;\n }\n }\n }\n > a{\n padding: 2rem 10px;\n font-family: inherit;\n font-size: 12px;\n font-weight: 400;\n color: $grey;\n background-color: $white;\n &:hover{\n background-color: $oil;\n color: $white;\n }\n &::after{\n display: none;\n }\n }\n }\n }\n }\n }\n}\n.search-button{\n right: 0;\n top: -3px;\n}\n.header-logo{\n float: left;\n margin-top: 12px;\n img{\n max-width: 270px;\n }\n}","","",".off-canvas-content .off-canvas.position-left.is-transition-overlap{\n z-index: 99999999;\n}\n.off-canvas-content .off-canvas.position-right.is-transition-overlap{\n z-index: 99999999;\n}\n.title-bar{\n background-color: $white;\n // margin-top: 30px !important;\n .menu-icon{\n background: transparent;\n background-color: transparent;\n box-shadow: none;\n border-color: transparent;\n }\n .menu-icon::after{\n background: $grey;\n box-shadow: 0 7px 0 $grey, 0 14px 0 $grey;\n }\n .header-logo{\n margin: 0 auto;\n float: none;\n img{\n max-height: 30px;\n }\n }\n}\n"],"mappings":"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","names":[]} \ No newline at end of file +{"version":3,"file":"glm-dev.css","sources":["glm-dev.scss","_global-settings.scss","_header.scss","_body.scss","_footer.scss","_off-canvas.scss"],"sourcesContent":["@import 'global-settings';\n@import 'header';\n@import 'body';\n@import 'footer';\n@import 'off-canvas';","$l-blue : #74a8c1;\n$blue : #156c96;\n$white : white;\n$grey : #9a9a9a;\n$oil : #333;",".top-menu-left{\n height: 28px;\n .top-bar{\n height: 28px;\n padding: 0;\n float: right;\n background-color: $blue;\n .top-bar-section{\n ul.dropdown.menu{\n .menu-item{\n > a{\n padding: .55rem 9px;\n font-size: 11px;\n color: $l-blue;\n background-color: $blue;\n &:hover{\n background-color: $l-blue;\n color: $white;\n }\n &::after{\n display: none;\n }\n }\n }\n }\n }\n }\n}\n#top-menu-right{\n .top-bar{\n padding: 0px;\n background-color: $white;\n float: right;\n margin-right: 30px;\n .top-bar-section{\n ul.dropdown.menu{\n \n min-width: 415px;\n -webkit-column-count: 3;\n -moz-column-count: 3;\n column-count: 3;\n .menu-item{\n ul.submenu{\n background: $oil;\n border: none;\n min-width: 415px;\n .three-col{\n \n -webkit-column-count: 3;\n -moz-column-count: 3;\n column-count: 3;\n }\n padding: 10px 10px 10px 250px;\n\n li.menu-item{\n overflow: hidden; /* fix for Firefox */\n break-inside: avoid-column;\n -webkit-column-break-inside: avoid;\n text-align: left;\n \n a{\n background-color: $oil;\n color: $white;\n padding: 5px;\n &:hover{\n background-color: $grey;\n background: $grey;\n \n }\n }\n }\n }\n > a{\n padding: 2rem 10px;\n font-family: inherit;\n font-size: 12px;\n font-weight: 400;\n color: $grey;\n background-color: $white;\n &:hover{\n background-color: $oil;\n color: $white;\n }\n &::after{\n display: none;\n }\n }\n }\n }\n }\n }\n .dropdown-image{\n ul.submenu{\n min-height: 125px;\n }\n }\n}\n.search-button{\n right: 0;\n top: -3px;\n}\n.header-logo{\n float: left;\n margin-top: 12px;\n img{\n max-width: 270px;\n }\n}","body{\n .js-off-canvas-overlay.is-overlay-fixed{\n z-index: 99999;\n }\n}","",".off-canvas-content .off-canvas.position-left.is-transition-overlap{\n z-index: 99999999;\n}\n.off-canvas-content .off-canvas.position-right.is-transition-overlap{\n z-index: 99999999;\n}\n.title-bar{\n background-color: $white;\n // margin-top: 30px !important;\n .menu-icon{\n background: transparent;\n background-color: transparent;\n box-shadow: none;\n border-color: transparent;\n }\n .menu-icon::after{\n background: $grey;\n box-shadow: 0 7px 0 $grey, 0 14px 0 $grey;\n }\n .header-logo{\n margin: 0 auto;\n float: none;\n img{\n max-height: 30px;\n }\n }\n}\n"],"mappings":"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","names":[]} \ No newline at end of file diff --git a/glm-dev/js/glm-dev.js b/glm-dev/js/glm-dev.js index 31b2162..3dda03c 100644 --- a/glm-dev/js/glm-dev.js +++ b/glm-dev/js/glm-dev.js @@ -1,3 +1,3 @@ jQuery(function($){ - + }); \ No newline at end of file diff --git a/glm-dev/scss/_body.scss b/glm-dev/scss/_body.scss index e69de29..42db0af 100644 --- a/glm-dev/scss/_body.scss +++ b/glm-dev/scss/_body.scss @@ -0,0 +1,5 @@ +body{ + .js-off-canvas-overlay.is-overlay-fixed{ + z-index: 99999; + } +} \ No newline at end of file diff --git a/glm-dev/scss/_header.scss b/glm-dev/scss/_header.scss index 1d036e6..e8ff570 100644 --- a/glm-dev/scss/_header.scss +++ b/glm-dev/scss/_header.scss @@ -8,7 +8,7 @@ .top-bar-section{ ul.dropdown.menu{ .menu-item{ - a{ + > a{ padding: .55rem 9px; font-size: 11px; color: $l-blue; @@ -17,6 +17,9 @@ background-color: $l-blue; color: $white; } + &::after{ + display: none; + } } } } @@ -32,15 +35,38 @@ .top-bar-section{ ul.dropdown.menu{ + min-width: 415px; + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; .menu-item{ ul.submenu{ background: $oil; border: none; - + min-width: 415px; + .three-col{ + + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; + } + padding: 10px 10px 10px 250px; + li.menu-item{ + overflow: hidden; /* fix for Firefox */ + break-inside: avoid-column; + -webkit-column-break-inside: avoid; + text-align: left; + a{ background-color: $oil; color: $white; + padding: 5px; + &:hover{ + background-color: $grey; + background: $grey; + + } } } } @@ -63,6 +89,11 @@ } } } + .dropdown-image{ + ul.submenu{ + min-height: 125px; + } + } } .search-button{ right: 0; diff --git a/inc/menu-walker.php b/inc/menu-walker.php index 541d5f8..80ea49f 100644 --- a/inc/menu-walker.php +++ b/inc/menu-walker.php @@ -8,11 +8,16 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu { static $mainLevelCounter; if ($depth == 0) { ++$mainLevelCounter; + $hasThumb = has_post_thumbnail($element->object_id); } + $numChildren = count( $children_elements[ $element->ID ] ); + $element->has_children = ! empty( $children_elements[ $element->ID ] ); $element->classes[] = ( $element->current || $element->current_item_ancestor ) ? 'active' : ''; $element->classes[] = ( $element->has_children && 1 !== $max_depth ) ? '' : ''; $element->classes[] = ( $element->post_parent == 0 && $mainLevelCounter < 6 ) ? '' : 'drop-left'; + $element->classes[] = ( $hasThumb) ? 'dropdown-image' : 'no-dropdown-image'; + $element->classes[] = ( $numChildren > 9 ) ? 'three-col' : 'one-col'; parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output ); } @@ -23,8 +28,26 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu { // Insert style to display page's thumbnail $item_style = ''; if ($depth == 0 && has_post_thumbnail((int)$object->object_id)) { - $thumbnail = wp_get_attachment_image_src(get_post_thumbnail_id((int)$object->object_id), 'large'); - $item_style .= ""; + + $thumbnail = wp_get_attachment_image_src(get_post_thumbnail_id((int)$object->object_id), 'dropdown-image'); + // $item_style .= ""; + + $item_style .= ""; + } else { + $item_style .= ""; } //$output .= ( 0 == $depth ) ? '
  • ' : ''; $classes = empty( $object->classes ) ? array() : (array) $object->classes; -- 2.17.1