Merge branch 'stage' into feature/local-dev-branch

assets/scss/blocks/taxonomy-select.scss

@@ -29,6 +29,9 @@
                     color: brand-color('tertiary');
                     text-decoration: underline;
                 }
+                img {
+                    min-height: 33px;
+                }
             }
         }
     }

config.codekit3

@@ -7,7 +7,7 @@
       "uuidString" : "F098CAB6-68FD-4BF6-AE0A-27C6B360832B"
     }
   ],
-  "creatorBuild" : "34518",
+  "creatorBuild" : "34484",
   "files" : {
     "\/.github\/workflows\/develop.yml" : {
       "cB" : 0,
@@ -5171,6 +5171,9 @@
         "active" : 0,
         "optionString" : "'except-parens'"
       },
+      "no-return-await" : {
+        "active" : 0
+      },
       "no-script-url" : {
         "active" : 0
       },

partials/content/header/main.php

@@ -27,10 +27,24 @@
 
 			if ( $menu_items and is_array( $menu_items ) ) :
 				foreach ( $menu_items as $item ) {
-					$link              = $item['link'];
-					$columns           = $item['columns'];
-					$number_of_columns = $item['number_of_columns'];
-					$current_url       = home_url( $_SERVER['REQUEST_URI'] );
+					$link         = $item['link'];
+					$columns      = $item['columns'];
+					$column_count = count( $columns );
+					$current_url  = home_url( $_SERVER['REQUEST_URI'] );
+
+					switch ( $column_count ) {
+						case 1:
+							$number_of_columns = 'one column';
+							break;
+						case 2:
+							$number_of_columns = 'two column';
+							break;
+						case 3:
+							$number_of_columns = 'three column';
+							break;
+						default:
+							$number_of_columns = 'one column';
+					}
 					?>
 
 					<li class="main-nav-link-li 
@@ -40,7 +54,7 @@
 					?>
 					">
 
-						<?php if ( '#' === $link['url'] ) { ?>
+						<?php if ( isset( $link[ 'url'] ) && '#' === $link['url'] ) { ?>
 							<button aria-label="<?php echo $link['title']; ?>" type="button" class="menu-item-main-link 
 															<?php
 															if ( empty( $columns ) ) {