Przeglądaj źródła

Varia: Code tidying.

Allan Cole 5 lat temu
rodzic
commit
81f5baa9e8

+ 11 - 11
varia/sass/vendors/woocommerce/components/_mini-cart.scss

@@ -42,17 +42,6 @@ body[class*="woocommerce"] #page { // adding #page here to override default wc s
 			}
 		}
 
-		@include media(mobile) {
-
-			& > div:not(:last-of-type) {
-				margin-right: #{ 2 * map-deep-get($config-global, "spacing", "horizontal")};
-			}
-
-			#toggle-cart {
-				display: none;
-			}
-		}
-
 		@include media(mobile-only) {
 
 			.woocommerce-menu-container {
@@ -70,6 +59,17 @@ body[class*="woocommerce"] #page { // adding #page here to override default wc s
 			}
 		}
 
+		@include media(mobile) {
+
+			& > div:not(:last-of-type) {
+				margin-right: #{ 2 * map-deep-get($config-global, "spacing", "horizontal")};
+			}
+
+			#toggle-cart {
+				display: none;
+			}
+		}
+
 		.woocommerce-cart-link {
 
 			display: none;

+ 13 - 0
varia/style-rtl.css

@@ -2513,6 +2513,11 @@ body:not(.fse-enabled) .site-description {
 	z-index: 1;
 }
 
+.main-navigation > div > ul li:hover, .main-navigation > div > ul li[focus-within] {
+	cursor: pointer;
+	z-index: 99999;
+}
+
 .main-navigation > div > ul li:hover, .main-navigation > div > ul li:focus-within {
 	cursor: pointer;
 	z-index: 99999;
@@ -2525,6 +2530,14 @@ body:not(.fse-enabled) .site-description {
 		/* Submenu display */
 	}
 	.main-navigation > div > ul li:hover > ul,
+	.main-navigation > div > ul li[focus-within] > ul,
+	.main-navigation > div > ul li ul:hover,
+	.main-navigation > div > ul li ul:focus {
+		visibility: visible;
+		opacity: 1;
+		display: block;
+	}
+	.main-navigation > div > ul li:hover > ul,
 	.main-navigation > div > ul li:focus-within > ul,
 	.main-navigation > div > ul li ul:hover,
 	.main-navigation > div > ul li ul:focus {

+ 12 - 9
varia/style-woocommerce-rtl.css

@@ -759,15 +759,6 @@ body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked +
 	display: inline;
 }
 
-@media only screen and (min-width: 560px) {
-	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
-		margin-left: 32px;
-	}
-	body[class*="woocommerce"] #page .main-navigation #toggle-cart {
-		display: none;
-	}
-}
-
 @media only screen and (max-width: 559px) {
 	body[class*="woocommerce"] #page .main-navigation .woocommerce-menu-container {
 		background-color: white;
@@ -782,6 +773,18 @@ body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked +
 	}
 }
 
+@media only screen and (min-width: 560px) {
+	body[class*="woocommerce"] #page .main-navigation {
+		display: flex;
+	}
+	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
+		margin-left: 32px;
+	}
+	body[class*="woocommerce"] #page .main-navigation #toggle-cart {
+		display: none;
+	}
+}
+
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-link {
 	display: none;
 	text-decoration: none;

+ 9 - 9
varia/style-woocommerce.css

@@ -759,15 +759,6 @@ body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked +
 	display: inline;
 }
 
-@media only screen and (min-width: 560px) {
-	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
-		margin-right: 32px;
-	}
-	body[class*="woocommerce"] #page .main-navigation #toggle-cart {
-		display: none;
-	}
-}
-
 @media only screen and (max-width: 559px) {
 	body[class*="woocommerce"] #page .main-navigation .woocommerce-menu-container {
 		background-color: white;
@@ -782,6 +773,15 @@ body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked +
 	}
 }
 
+@media only screen and (min-width: 560px) {
+	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
+		margin-right: 32px;
+	}
+	body[class*="woocommerce"] #page .main-navigation #toggle-cart {
+		display: none;
+	}
+}
+
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-link {
 	display: none;
 	text-decoration: none;