Merge branch 'release/1.2.9'

siteorigin · Dec 5, 2016 · a5b32a9 · a5b32a9
2 parents 69aa32f + d0d05cd
commit a5b32a9
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 67 deletions.
diff --git a/build b/build
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,13 @@
+== Changelog ==
+
+View full release information on [Github](https://github.com/siteorigin/siteorigin-north/releases).
+
+= 1.2.9 - 05 December 2016 =
+* Fixed mobile menu breakpoint warning notice bug.
+* Improved mobile menu breakpoint setting allowing lower values.
+* Improve WooCommerce product quickview modal closing.
+* Fix WooCommerce product quickview modal title overlap bug.
+
 = 1.2.8 - 07 November 2016 =
 * Updated settings framework.
 * Fixed sidebar margin responsive bug.

diff --git a/inc/settings.php b/inc/settings.php
@@ -933,68 +933,34 @@ function siteorigin_north_settings_custom_css($css){
  * Add CSS for mobile menu breakpoint
  */
 function siteorigin_north_menu_breakpoint_css( $css, $settings ) {
-	if( $settings[ 'theme_settings_responsive_menu_breakpoint' ] != null ) {
-
-		$breakpoint = $settings[ 'theme_settings_responsive_menu_breakpoint' ];
-
-		$css .= '@media screen and (max-width: ' . $breakpoint  . 'px) {
-			body.responsive .main-navigation #mobile-menu-button {
-				display: inline-block;
-			}
-			body.responsive .main-navigation ul {
-				display: none;
-			}
-			body.responsive .main-navigation .north-search-icon {
-				display: none;
-			}
-			.main-navigation #mobile-menu-button {
-				display: none;
-			}
-			.main-navigation ul {
-				display: inline-block;
-			}
-			.main-navigation .north-search-icon {
-				display: inline-block;
-			}
+	$breakpoint = isset( $settings[ 'theme_settings_responsive_menu_breakpoint' ] ) ? $settings[ 'theme_settings_responsive_menu_breakpoint' ] : 600;
+
+	$css .= '@media screen and (max-width: ' . intval( $breakpoint ) . 'px) {
+		body.responsive .main-navigation #mobile-menu-button {
+			display: inline-block;
 		}
-		@media screen and (min-width: ' . ( 1 + $breakpoint ) . 'px) {
-			body.responsive #mobile-navigation {
-				display: none !important;
-			}
-		}';
-
-	} else {
-
-		$css .= '@media screen and (max-width: 600px) {
-			body.responsive .main-navigation #mobile-menu-button {
-				display: inline-block;
-			}
-			body.responsive .main-navigation ul {
-				display: none;
-			}
-			body.responsive .main-navigation .north-search-icon {
-				display: none;
-			}
-			.main-navigation #mobile-menu-button {
-				display: none;
-			}
-			.main-navigation ul {
-				display: inline-block;
-			}
-			.main-navigation .north-search-icon {
-				display: inline-block;
-			}
+		body.responsive .main-navigation ul {
+			display: none;
+		}
+		body.responsive .main-navigation .north-search-icon {
+			display: none;
+		}
+		.main-navigation #mobile-menu-button {
+			display: none;
+		}
+		.main-navigation ul {
+			display: inline-block;
+		}
+		.main-navigation .north-search-icon {
+			display: inline-block;
 		}
-		@media screen and (min-width: 601px) {
-			body.responsive #mobile-navigation {
-				display: none !important;
-			}
-		}';
-
 	}
-
+	@media screen and (min-width: ' . ( 1 + $breakpoint ) . 'px) {
+		body.responsive #mobile-navigation {
+			display: none !important;
+		}
+	}';
 	return $css;
-
 }
 endif;
 add_filter( 'siteorigin_settings_custom_css', 'siteorigin_north_menu_breakpoint_css', 10, 2 );

diff --git a/js/woocommerce.js b/js/woocommerce.js
@@ -69,7 +69,7 @@ jQuery( function($){
 
 		$(window).mouseup(function (e) {
 		    var container = $($content);
-		    if ( (! container.is(e.target) && container.has(e.target).length === 0) || $('.quickview-close-icon') ) {
+		    if ( ( !container.is(e.target) && container.has(e.target).length === 0 ) || $( '.quickview-close-icon' ).is(e.target) ) {
 		        $($container).fadeOut(300);
 		    }
 		});

diff --git a/sass/woocommerce/_quickview.scss b/sass/woocommerce/_quickview.scss
@@ -89,9 +89,7 @@
 					font-family: $font__detail;
 					font-size: 1.2em;
 					line-height: 2.5;
-					position: absolute;
-					top: 22px;
-					right: 20px;
+					float: right;
 
 					del {
 						opacity: 0.5;
@@ -102,6 +100,10 @@
 					}
 				}
 
+				.product_title {
+					float: none;
+				}
+
 				.star-rating {
 					float: none;
 				}

diff --git a/woocommerce.css b/woocommerce.css
@@ -870,13 +870,13 @@
       font-family: "Droid Serif", sans-serif;
       font-size: 1.2em;
       line-height: 2.5;
-      position: absolute;
-      top: 22px;
-      right: 20px; }
+      float: right; }
       .woocommerce #quick-view-container .product-content-wrapper .product-info-wrapper .price del {
         opacity: 0.5; }
       .woocommerce #quick-view-container .product-content-wrapper .product-info-wrapper .price ins {
         background: none; }
+    .woocommerce #quick-view-container .product-content-wrapper .product-info-wrapper .product_title {
+      float: none; }
     .woocommerce #quick-view-container .product-content-wrapper .product-info-wrapper .star-rating {
       float: none; }
     .woocommerce #quick-view-container .product-content-wrapper .product-info-wrapper .cart {

diff --git a/woocommerce/functions.php b/woocommerce/functions.php
@@ -23,8 +23,8 @@ function siteorigin_north_woocommerce_change_hooks(){
 
 	// Quick view action hooks
 	add_action( 'siteorigin_north_woocommerce_quick_view_images', 'siteorigin_north_woocommerce_quick_view_image', 5 );
+	add_action( 'siteorigin_north_woocommerce_quick_view_title', 'woocommerce_template_single_price', 5 );
 	add_action( 'siteorigin_north_woocommerce_quick_view_title', 'woocommerce_template_single_title', 5 );
-	add_action( 'siteorigin_north_woocommerce_quick_view_content', 'woocommerce_template_single_price', 10 );
 	add_action( 'siteorigin_north_woocommerce_quick_view_content', 'woocommerce_template_loop_rating', 15 );
 	add_action( 'siteorigin_north_woocommerce_quick_view_content', 'woocommerce_template_single_excerpt', 15 );
 	add_action( 'siteorigin_north_woocommerce_quick_view_content', 'woocommerce_template_single_add_to_cart', 20 );