瀏覽代碼

Merge branch 'enhancement/add-wc-support' into enhancement/add-wc-support-barnsbury

Allan Cole 5 年之前
父節點
當前提交
e2e28f835d

+ 4 - 0
varia/sass/child-theme/_config-child-theme-woocommerce.scss

@@ -4,6 +4,9 @@
 
 $config-woocommerce: (
 
+	/* Wrapper Width - accepts full, wide, or defuault */
+	"wrapper-width": default,
+
 	/* Tables */
 	"table": (
 		/* Borders */
@@ -41,6 +44,7 @@ $config-woocommerce: (
 			"color": map-deep-get($config-button, "color", "text"),
 			"background-color": map-deep-get($config-button, "color", "background"),
 		),
+		"width": #{25 * map-deep-get($config-global, "spacing", "unit")},
 	),
 
 	/* Star Rating */

+ 4 - 0
varia/sass/vendors/woocommerce/abstracts/_config-woocommerce.scss

@@ -4,6 +4,9 @@
 
 $config-woocommerce: (
 
+	/* Wrapper Width - accepts full, wide, or defuault */
+	"wrapper-width": default,
+
 	/* Tables */
 	"table": (
 		/* Borders */
@@ -41,6 +44,7 @@ $config-woocommerce: (
 			"color": map-deep-get($config-button, "color", "text"),
 			"background-color": map-deep-get($config-button, "color", "background"),
 		),
+		"width": #{25 * map-deep-get($config-global, "spacing", "unit")},
 	),
 
 	/* Star Rating */

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

@@ -47,6 +47,7 @@ body[class*="woocommerce"] #page { // adding #page here to override default wc s
 		}
 
 		.woocommerce-cart-widget {
+
 			background-color: map-deep-get($config-woocommerce, "mini-cart", "color", "background");
 			color: map-deep-get($config-woocommerce, "mini-cart", "color", "text");
 			max-width: 100%;
@@ -62,6 +63,11 @@ body[class*="woocommerce"] #page { // adding #page here to override default wc s
 				li {
 					border-top: 1px solid map-deep-get($config-woocommerce, "mini-cart", "color", "border");
 				}
+
+				a.remove:hover,
+				a.remove:focus {
+					text-decoration: none;
+				}
 			}
 
 			.woocommerce-mini-cart__total {
@@ -118,6 +124,25 @@ body[class*="woocommerce"] #page { // adding #page here to override default wc s
 			@include font-family( map-deep-get($config-header, "main-nav", "font", "family") );
 			font-size: #{map-deep-get($config-global, "font", "size", "base")};
 		}
+
+		@include media(mobile) {
+
+			& > div > ul > li.woocommerce-menu-item > .sub-menu {
+				left: auto;
+				right: 0;
+			}
+
+			.woocommerce-cart-widget {
+				max-width: #{map-deep-get($config-woocommerce, "mini-cart", "width")};
+			}
+
+			& > div > ul > li.woocommerce-menu-item:hover > ul:before,
+			& > div > ul > li.woocommerce-menu-item.focus > ul:before,
+			& > div > ul > li.woocommerce-menu-item.current-menu-item > ul:before {
+				margin-left: auto;
+				margin-right: #{map-deep-get($config-global, "spacing", "unit")};
+			}
+		}
 	}
 }
 

+ 22 - 0
varia/sass/vendors/woocommerce/layout/_structure.scss

@@ -2,6 +2,28 @@
  * Structure
  */
 
+
+/**
+ * WooCommerce Wrapper Width
+ */
+
+body[class*="woocommerce"] #page .woocommerce,
+body[class*="woocommerce"] #page #woocommerce-wrapper,
+body[class*="woocommerce"] #page .woocommerce-Tabs-panel.entry-content > *:not(.alignwide):not(.alignfull):not(.alignleft):not(.alignright):not(.wp-block-separator):not(.entry-attachment) {
+
+	// Get wrapper width setting
+	$wc-wrapper-width: map-deep-get($config-woocommerce, "wrapper-width");
+
+	@if $wc-wrapper-width == wide {
+		@extend %responsive-alignwide-nested;
+	} @else if $wc-wrapper-width == full {
+		@extend %responsive-alignfull;
+	} @else {
+		// Default width
+	}
+}
+
+
 /**
  * Vertical Space - 32px
  */

+ 24 - 0
varia/style-woocommerce-rtl.css

@@ -787,6 +787,11 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .wooc
 	border-top: 1px solid #AAAAAA;
 }
 
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a.remove:hover,
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a.remove:focus {
+	text-decoration: none;
+}
+
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce-mini-cart__total {
 	text-align: left;
 }
@@ -842,6 +847,22 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-mini-cart__total
 	font-size: 1rem;
 }
 
+@media only screen and (min-width: 560px) {
+	body[class*="woocommerce"] #page .main-navigation > div > ul > li.woocommerce-menu-item > .sub-menu {
+		right: auto;
+		left: 0;
+	}
+	body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget {
+		max-width: 400px;
+	}
+	body[class*="woocommerce"] #page .main-navigation > div > ul > li.woocommerce-menu-item:hover > ul:before,
+	body[class*="woocommerce"] #page .main-navigation > div > ul > li.woocommerce-menu-item.focus > ul:before,
+	body[class*="woocommerce"] #page .main-navigation > div > ul > li.woocommerce-menu-item.current-menu-item > ul:before {
+		margin-right: auto;
+		margin-left: 16px;
+	}
+}
+
 .woocommerce-cart #page .woocommerce-menu-item .sub-menu,
 .woocommerce-checkout #page .woocommerce-menu-item .sub-menu {
 	display: none;
@@ -1164,6 +1185,9 @@ body[class*="woocommerce"] #page #reviews #comments .commentlist > li::before {
 /**
  * Structure
  */
+/**
+ * WooCommerce Wrapper Width
+ */
 /**
  * Vertical Space - 32px
  */

+ 24 - 0
varia/style-woocommerce.css

@@ -787,6 +787,11 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .wooc
 	border-top: 1px solid #AAAAAA;
 }
 
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a.remove:hover,
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a.remove:focus {
+	text-decoration: none;
+}
+
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce-mini-cart__total {
 	text-align: right;
 }
@@ -842,6 +847,22 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-mini-cart__total
 	font-size: 1rem;
 }
 
+@media only screen and (min-width: 560px) {
+	body[class*="woocommerce"] #page .main-navigation > div > ul > li.woocommerce-menu-item > .sub-menu {
+		left: auto;
+		right: 0;
+	}
+	body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget {
+		max-width: 400px;
+	}
+	body[class*="woocommerce"] #page .main-navigation > div > ul > li.woocommerce-menu-item:hover > ul:before,
+	body[class*="woocommerce"] #page .main-navigation > div > ul > li.woocommerce-menu-item.focus > ul:before,
+	body[class*="woocommerce"] #page .main-navigation > div > ul > li.woocommerce-menu-item.current-menu-item > ul:before {
+		margin-left: auto;
+		margin-right: 16px;
+	}
+}
+
 .woocommerce-cart #page .woocommerce-menu-item .sub-menu,
 .woocommerce-checkout #page .woocommerce-menu-item .sub-menu {
 	display: none;
@@ -1164,6 +1185,9 @@ body[class*="woocommerce"] #page #reviews #comments .commentlist > li::before {
 /**
  * Structure
  */
+/**
+ * WooCommerce Wrapper Width
+ */
 /**
  * Vertical Space - 32px
  */