Merge branch 'pr/9749'

2015-12-04 12:05:55 +00:00 · 2015-12-04 12:05:55 +00:00 · b09851c642
parent 948a8f5c47 1ade6adf71
commit b09851c642
3 changed files with 13 additions and 11 deletions
--- a/assets/css/woocommerce-smallscreen.css
+++ b/assets/css/woocommerce-smallscreen.css
--- a/assets/css/woocommerce-smallscreen.scss
+++ b/assets/css/woocommerce-smallscreen.scss
@ -99,6 +99,7 @@
 	/**
 	 * Products
 	 */
+	&[class*="columns-"] {
 		ul.products {
 			li.product {
 				width: 48%;
@ -112,6 +113,7 @@
 				}
 			}
 		}
+	}

 	/**
 	 * Product Details
--- a/assets/js/jquery-qrcode/jquery.qrcode.min.js
+++ b/assets/js/jquery-qrcode/jquery.qrcode.min.js