Merge branch 'release/1.3.14'

siteorigin · Jun 30, 2017 · 6c38030 · 6c38030
2 parents cfd137c + b8eda31
commit 6c38030
Show file tree

Hide file tree

Showing 10 changed files with 320 additions and 308 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,11 @@
 == Changelog ==
 
+= 1.3.14 - 30 June 2017 =
+* Changed WooCommerce widget styling to apply to non-WooCommerce pages.
+* Fixed WooCommerce notification bar padding.
+* Updated WooCommerce Cart and Mini-Cart templates.
+* Update WooCommerce Mini-Cart styling to match updated template.
+
 = 1.3.13 - 28 June 2017 =
 * Resolved header shadow bug. 
 * Added support for Max Mega Menu.

diff --git a/readme.txt b/readme.txt
@@ -38,6 +38,7 @@ SiteOrigin North includes support for:
 * Breadcrumb NavXT
 * Jetpack Infinite Scroll
 * Jetpack Responsive Videos
+* Max Mega Menu
 * SiteOrigin CSS
 * SiteOrigin Page Builder
 * SiteOrigin Widgets Bundle 

diff --git a/sass/woocommerce.scss b/sass/woocommerce.scss
@@ -45,3 +45,8 @@
 # WooCommerce My Account page
 --------------------------------------------------------------*/
 @import "woocommerce/account";
+
+/*--------------------------------------------------------------
+# WooCommerce Notifications
+--------------------------------------------------------------*/
+@import "woocommerce/notifications";
diff --git a/sass/woocommerce/_cart.scss b/sass/woocommerce/_cart.scss
@@ -334,110 +334,111 @@
 		}
 	}
 }
+.widget_shopping_cart {
+	.widget_shopping_cart_content {
+		padding: 15px !important;
 
-.widget_shopping_cart_content {
-	padding: 15px;
+		.cart_list{
+			.empty {
+				margin: 15px 15px;
+			}
 
-	.cart_list{
-		.empty {
-			margin: 15px 15px;
-		}
+			.mini_cart_item {
+				position: relative;
+				margin: 0 0 15px 0;
+				box-sizing: border-box;
 
-		.mini_cart_item {
-			position: relative;
-			margin: 0 0 15px 0;
-			box-sizing: border-box;
+				a {
+					padding: 0 !important;
+					text-decoration: none;
+				}
 
-			a {
-				padding: 0 !important;
-				text-decoration: none;
-			}
+				.mini_cart_img {
+					width: 65px;
+					float: left;
+				}
 
-			.mini_cart_img {
-				width: 65px;
-				float: left;
-			}
+				.mini_cart_details {
+					margin-left: 80px;
 
-			.mini_cart_details {
-				margin-left: 80px;
+					.mini_cart_product {
+						color: $color__text_dark;
+						font-weight: bold;
+						line-height: 1.5em;
+						margin: 0 0 7px 0;
+						padding-right: 23px;
+					}
 
-				.mini_cart_product {
-					color: $color__text_dark;
-					font-weight: bold;
-					line-height: 1.5em;
-					margin: 0 0 7px 0;
-					padding-right: 23px;
+					.mini_cart_cost {
+						margin: 0;
+						color: $color__primary_accent;
+					}
 				}
 
-				.mini_cart_cost {
-					margin: 0;
-					color: $color__primary_accent;
+				&:last-child {
+					margin-bottom: 0;
 				}
-			}
-
-			&:last-child {
-				margin-bottom: 0;
-			}
 
-			.remove {
-				color: $color__woo-secondary !important;
-				min-width: 15px;
-				position: absolute;
-				right: 0;
-				top: 0;
+				.remove {
+					color: $color__woo-secondary !important;
+					min-width: 15px;
+					position: absolute;
+					right: 0;
+					top: 0;
 
-				&:hover {
-					background: transparent;
-					color: $color__primary_accent_dark !important;
+					&:hover {
+						background: transparent;
+						color: $color__primary_accent_dark !important;
+					}
 				}
 			}
 		}
-	}
 
-	.total {
-		border-top: none !important;
-		text-align: center;
-		margin: 10px 0 0 0;
-		padding-top: 0;
-	}
+		.total {
+			border-top: none !important;
+			text-align: center;
+			margin: 10px 0 0 0;
+			padding-top: 0;
+		}
 
-	.buttons {
-		text-align: center;
-		text-transform: uppercase;
-		margin: 10px 0 0 0;
-		padding-top: 0;
-
-		a {
-			font-weight: normal;
-			border-radius: 0px;
-			font-size: 0.85em;
-			padding: 10px;
-			line-height: 1em;
-			box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.25);
-			font-family: $font__headings;
-			text-decoration: none;
+		.buttons {
+			text-align: center;
 			text-transform: uppercase;
-			text-shadow: none;
-			@include transition(0.085s);
-			min-width: inherit;
+			margin: 10px 0 0 0;
+			padding-top: 0;
 
-			&.mini_cart_view {
-				background: transparent;
-				border: 1px solid $color__text_dark;
-				color: $color__text_dark;
-			}
+			a {
+				font-weight: normal;
+				border-radius: 0px;
+				font-size: 0.85em;
+				padding: 10px;
+				line-height: 1em;
+				box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.25);
+				font-family: $font__headings;
+				text-decoration: none;
+				text-transform: uppercase;
+				text-shadow: none;
+				@include transition(0.085s);
+				min-width: inherit;
 
-			&.mini_cart_checkout {
-				background: $color__primary_accent;
-				border: 1px solid $color__primary_accent;
-				color: #fff;
-			}
+				&.mini_cart_view {
+					background: transparent;
+					border: 1px solid $color__text_dark;
+					color: $color__text_dark;
+				}
 
-			&:hover {
-				background: $color__primary_accent_dark;
-				color: #fff;
-				border-color: $color__primary_accent_dark;
-				box-shadow: none;
+				&.mini_cart_checkout {
+					background: $color__primary_accent;
+					border: 1px solid $color__primary_accent;
+					color: #fff;
+				}
+
+				&:hover {
+					background: $color__primary_accent_dark;
+					color: #fff;
+					border-color: $color__primary_accent_dark;
+					box-shadow: none;
+				}
 			}
 		}
 	}

diff --git a/sass/woocommerce/_notifications.scss b/sass/woocommerce/_notifications.scss
@@ -0,0 +1,8 @@
+.entry-content {
+
+	.woocommerce-message,
+	.woocommerce-error,
+	.woocommerce-info {
+		padding: 1em 2em 1em 3.5em;	
+	}
+}
diff --git a/sass/woocommerce/_reviews.scss b/sass/woocommerce/_reviews.scss
@@ -1,4 +1,4 @@
-.woocommerce #reviews{
+.woocommerce #reviews {
 
 	#comments {
 		ol.commentlist {