Merge pull request #124 from bigboxwc/release/3.1.1

release/3.1.1

Author: spencerfinnell

CHANGELOG.md

@@ -1,3 +1,14 @@
+## [3.1.1] - 2018-02-18
+
+### Fix
+
+- Avoid PHP error in cart-shipping.php
+- Ensure `.posted_in` uses the correct gray color.
+- Simplify WooCommerce gallery image widths.
+- Don't let FacetWP radio/checkbox labels trigger refresh.
+- Mobile WooCommerce coupon form styling.
+- Update Node dependencies.
+
 ## [3.1.0] - 2018-02-15
 
 ### New

app/customize/output/color-gray-200.php

@@ -29,6 +29,7 @@
 			'.widget',
 			'.woocommerce-MyAccount-navigation:after',
 			'.woocommerce-single-product-data__section',
+			'.posted_in',
 			'.footer-nav',
 			'.wp-block-separator',
 			'.comment',

app/integrations/woocommerce/template-functions.php

@@ -560,8 +560,6 @@ function bigbox_woocommerce_single_product_carousel_options( $args ) {
 		]
 	);
 
-	$args['thumbnailPosition'] = 'side';
-
 	return $args;
 }
 

package.json

@@ -3,7 +3,7 @@
 	"title": "BigBox",
 	"author": "Spencer Finnell",
 	"description": "Easily manage and scale WooCommerce product catalogs.",
-	"version": "3.1.0",
+	"version": "3.1.1",
 	"license": "GPL-2.0-or-later",
 	"main": "webpack.config.js",
 	"engines": {

resources/assets/js/facetwp/choices.js

@@ -44,6 +44,11 @@ $document.on( 'facetwp-loaded', () => {
 		wrapper.innerHTML = '';
 		wrapper.prepend( label );
 
+		// Don't trigger change event to ensure FWP is what executes a reload.
+		label.addEventListener( 'click', ( e ) => {
+			e.preventDefault();
+		} );
+
 		// Better visual feedback (automatically check when clicked.)
 		wrapper.addEventListener( 'click', ( e ) => {
 			// Don't toggle if already disabled.

resources/assets/js/woocommerce/products.js

@@ -55,24 +55,17 @@ domReady( () => {
 
 	const { itemWidth, thumbnailPosition } = params.flexslider;
 
-	const img = document.querySelector( '.woocommerce-product-gallery__wrapper .woocommerce-product-gallery__image .wp-post-image' );
-	const flex = document.querySelector( '.woocommerce-product-gallery--with-images .flex-viewport' );
+	const img = document.querySelector( '.woocommerce-product-gallery__wrapper .wp-post-image' );
+	let imgWrapper = document.querySelector( '.woocommerce-product-gallery--with-images .flex-viewport' );
 
-	if ( ! img || ! flex ) {
-		return;
+	// Check for placeholder image wrapper.
+	if ( ! imgWrapper ) {
+		imgWrapper = document.querySelector( '.woocommerce-product-gallery--with-images .woocommerce-product-gallery__wrapper' )
 	}
 
-	img.addEventListener( 'load', () => {
-		// Max width of wrapper.
-		flex.style.maxWidth = `${ itemWidth }px`;
-
-		// Contain whole gallery when thumbnails are on the bottom.
-		if ( 'bottom' === thumbnailPosition ) {
-			const wrapper = document.querySelector( '.woocommerce-product-gallery--with-images' );
-			const nav = document.querySelector( '.woocommerce-product-gallery--with-images .flex-control-nav' );
+	if ( ! img || ! imgWrapper ) {
+		return;
+	}
 
-			nav.style.maxWidth = `${ itemWidth }px`;
-			wrapper.style.maxWidth = `${ itemWidth }px`;
-		}
-	} );
+	imgWrapper.style.maxWidth = `${ itemWidth }px`;
 } );

resources/assets/scss/modules/woocommerce-checkout.scss

@@ -185,22 +185,22 @@ form.woocommerce-checkout {
 
 	.form-row-first,
 	.form-row-last {
-		flex: 1 0;
+		flex: 1 1 auto;
 		margin-bottom: 0;
 	}
 
-	.form-row-first {
-		flex-basis: 60%;
-	}
-
 	.form-row-last {
-		margin-left: $spacer;
-		flex-basis: auto;
+		margin: $spacer 0 0 0;
+		flex-basis: 100%;
+
+		@include media-breakpoint-up(sm) {
+			margin: 0 0 0 $spacer;
+			flex-basis: auto;
+		}
 	}
 
 	[name="apply_coupon"] {
 
-		@include button--color("success");
 		@include button--size-sm();
 		@include button--size-block();
 	}

resources/views/integrations/woocommerce/cart/cart-shipping.php

@@ -97,7 +97,7 @@
 		<?php
 		// No address available.
 	elseif ( ! $formatted_destination && $available_methods ) :
-		$note = echo wp_kses_post(
+		$note = wp_kses_post(
 			apply_filters(
 				'woocommerce_shipping_may_be_available_html',
 				__( 'Enter your address to view shipping options.', 'bigbox' )

resources/views/integrations/woocommerce/single-product/product-image.php

@@ -43,7 +43,7 @@
 );
 ?>
 
-<div class="<?php echo esc_attr( implode( ' ', array_map( 'sanitize_html_class', $wrapper_classes ) ) ); ?>" data-columns="<?php echo esc_attr( $columns ); ?>" style="opacity: 0; transition: opacity .25s ease-in-out;">
+<div class="<?php echo esc_attr( implode( ' ', array_map( 'sanitize_html_class', $wrapper_classes ) ) ); ?>" data-columns="<?php echo esc_attr( $columns ); ?>" data-width="<?php echo esc_attr( $width ); ?>px" style="opacity: 0; transition: opacity .25s ease-in-out;">
 	<figure class="woocommerce-product-gallery__wrapper">
 		<?php
 		if ( has_post_thumbnail() ) {