ソースを参照

Merge pull request #2621 from Automattic/fix/seedlet-menu-keyoboard-navigation

Seedlet: Fix keyboard navigation in the menu
Ben Dwyer 4 年 前
コミット
3e3c038e29

+ 2 - 0
seedlet/assets/css/style-navigation-rtl.css

@@ -4,6 +4,7 @@
 .menu-button-container {
 	display: none;
 	justify-content: space-between;
+	margin: 0;
 	right: 0;
 	position: absolute;
 	top: 0;
@@ -13,6 +14,7 @@
 @media only screen and (max-width: 481px) {
 	.menu-button-container {
 		display: block;
+		margin: 0;
 	}
 }
 

+ 2 - 0
seedlet/assets/css/style-navigation.css

@@ -4,6 +4,7 @@
 .menu-button-container {
 	display: none;
 	justify-content: space-between;
+	margin: 0;
 	left: 0;
 	position: absolute;
 	top: 0;
@@ -13,6 +14,7 @@
 @media only screen and (max-width: 481px) {
 	.menu-button-container {
 		display: block;
+		margin: 0;
 	}
 }
 

ファイルの差分が大きいため隠しています
+ 0 - 0
seedlet/assets/css/style-navigation.css.map


+ 2 - 0
seedlet/assets/sass/components/navigation/_style.scss

@@ -4,6 +4,7 @@
 .menu-button-container {
 	display: none;
 	justify-content: space-between;
+	margin: 0;
 	left: 0;
 	position: absolute;
 	top: 0;
@@ -11,6 +12,7 @@
 
 	@include media( $navigation-max-break-point ){
 		display: block;
+		margin: 0;
 	}
 
 	// Adjust button postion when scrolling is locked

+ 18 - 14
seedlet/header.php

@@ -24,20 +24,6 @@
 	<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'seedlet' ); ?></a>
 
 		<header id="masthead" class="site-header default-max-width" role="banner">
-			<div class="menu-button-container">
-				<?php if ( class_exists( 'WooCommerce' ) ) : ?>
-					<button id="woo-open-menu" class="button open">
-						<span class="dropdown-icon open"><?php echo seedlet_get_icon_svg( 'shopping_cart' ); ?> <?php _e( 'Cart', 'seedlet' ); ?></span>
-						<span class="hide-visually expanded-text"><?php esc_html__( 'expanded', 'seedlet' ); ?></span>
-					</button>
-				<?php endif; ?>
-				<?php if ( has_nav_menu( 'primary' ) ) : ?>
-					<button id="primary-open-menu" class="button open">
-						<span class="dropdown-icon open"><?php _e( 'Menu', 'seedlet' ); ?> <?php echo seedlet_get_icon_svg( 'menu' ); ?></span>
-						<span class="hide-visually expanded-text"><?php _e( 'expanded', 'seedlet' ); ?></span>
-					</button>
-				<?php endif; ?>
-			</div>
 			<?php get_template_part( 'template-parts/header/site-branding' ); ?>
 
 			<?php if ( has_nav_menu( 'primary' ) ) : ?>
@@ -65,6 +51,15 @@
 				</nav><!-- #site-navigation -->
 			<?php endif; ?>
 
+			<div class="menu-button-container">
+				<?php if ( has_nav_menu( 'primary' ) ) : ?>
+					<button id="primary-open-menu" class="button open">
+						<span class="dropdown-icon open"><?php _e( 'Menu', 'seedlet' ); ?> <?php echo seedlet_get_icon_svg( 'menu' ); ?></span>
+						<span class="hide-visually expanded-text"><?php _e( 'expanded', 'seedlet' ); ?></span>
+					</button>
+				<?php endif; ?>
+			</div>
+
 			<?php if ( class_exists( 'WooCommerce' ) ) : ?>
 				<nav class="woo-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Woo Minicart', 'seedlet' ); ?>">
 					<?php
@@ -96,6 +91,15 @@
 				</nav><!-- .woo-navigation -->
 			<?php endif; ?>
 
+			<div class="menu-button-container">
+				<?php if ( class_exists( 'WooCommerce' ) ) : ?>
+					<button id="woo-open-menu" class="button open">
+						<span class="dropdown-icon open"><?php echo seedlet_get_icon_svg( 'shopping_cart' ); ?> <?php _e( 'Cart', 'seedlet' ); ?></span>
+						<span class="hide-visually expanded-text"><?php esc_html__( 'expanded', 'seedlet' ); ?></span>
+					</button>
+				<?php endif; ?>
+			</div>
+
 			<?php if ( has_nav_menu( 'social' ) ) : ?>
 				<nav class="social-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Social Links Menu', 'seedlet' ); ?>">
 					<?php

+ 2 - 0
spearhead/navigation-rtl.css

@@ -7,6 +7,7 @@
 .menu-button-container {
 	display: none;
 	justify-content: space-between;
+	margin: 0;
 	right: 0;
 	position: absolute;
 	top: 0;
@@ -16,6 +17,7 @@
 @media only screen and (max-width: 829px) {
 	.menu-button-container {
 		display: block;
+		margin: 0;
 	}
 }
 

+ 2 - 0
spearhead/navigation.css

@@ -7,6 +7,7 @@
 .menu-button-container {
 	display: none;
 	justify-content: space-between;
+	margin: 0;
 	left: 0;
 	position: absolute;
 	top: 0;
@@ -16,6 +17,7 @@
 @media only screen and (max-width: 829px) {
 	.menu-button-container {
 		display: block;
+		margin: 0;
 	}
 }
 

ファイルの差分が大きいため隠しています
+ 0 - 0
spearhead/navigation.css.map


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません