Resolve conflicts

Gruntfile.js

@@ -287,6 +287,7 @@ module.exports = function( grunt ) {
 					'!node_modules/**',
 					'!.DS_Store',
 					'!npm-debug.log',
+					'!composer.json',
 					'!assets/css/sass/**',
 					'!assets/css/**/*.scss'
 				],

README.md

@@ -38,7 +38,7 @@ If you have a patch, or stumbled you've upon an issue with Storefront core, you
 
 If you have an idea or feature request please take a look at the [Storefront Ideasboard](http://ideas.woocommerce.com/forums/275029-storefront) to see if it's already been suggested, planned, or is under development. If not, please add it there.
 
-You can keep up with the latest Storefront developments on the [dev blog](https://storefront.wordpress.com/).
+You can keep up with the latest Storefront developments on the [dev blog](https://woocommerce.wordpress.com/category/storefront/).
 
 ## Testing Storefront
 Want to help test upcoming Storefront releases? Check out the [Storefront Beta Tester](https://github.com/seb86/Storefront-Beta-Tester) plugin.

README.txt

@@ -1,9 +1,9 @@
 === Storefront ===
 Contributors: automattic, tiagonoronha, jameskoster
 Requires at least: 4.7
-Tested up to: 4.9
-Stable tag: 2.2.7
-Version: 2.2.7
+Tested up to: 4.9.4
+Stable tag: 2.2.8
+Version: 2.2.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: e-commerce, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-header, custom-menu, featured-images, full-width-template, threaded-comments, accessibility-ready, rtl-language-support, footer-widgets, sticky-post, theme-options
@@ -43,6 +43,16 @@ Images License: GNU General Public License v2 or later
 
 == Changelog ==
 
+= 2.2.8 - 2018-02-13 =
+* Fix - Image bleed from next image in the gallery.
+* Fix - H1 site title tag on Front page instead of Posts page.
+* Fix - Number of columns and rows can now be changed in the Customizer.
+* Fix - Logo image size in Internet Explorer.
+* Fix - Prevent sidebar from overflowing the content at small sizes on cart page.
+* Fix - 404 page responsive layout.
+* Tweak - Updated development blog links.
+* Feature - WooCommerce Memberships integration.
+
 = 2.2.7 - 2018-01-23 =
 * Fix - Reverted Chromium overflow fix introduced in 2.2.6 due to incompatibility with other Storefront products.
 * Fix - Jetpack Google Translate widget styling.

assets/css/base/_base.scss

@@ -292,20 +292,13 @@ body {
 	.site-logo-link,
 	.custom-logo-link {
 		display: block;
+		margin-bottom: 0;
 
 		img {
 			max-width: 210px;
 		}
 	}
 
-	.site-branding,
-	.site-logo-anchor,
-	.site-logo-link,
-	.custom-logo-link {
-		margin-bottom: 0;
-		float: left;
-	}
-
 	.widget {
 		margin-bottom: 0;
 	}
@@ -337,6 +330,9 @@ body {
 }
 
 .site-branding {
+	float: left;
+	margin-bottom: 0;
+
 	.site-title {
 		font-size: 2em;
 		letter-spacing: -1px;

assets/css/woocommerce/woocommerce.scss

@@ -2790,3 +2790,16 @@ dl.variation {
 		padding-right: 2.618rem;
 	}
 }
+
+@media (min-width: $desktop) and (max-width: 900px) {
+	body {
+		&:not(.page-template-template-fullwidth-php) {
+			table.cart {
+				td,
+				th {
+					padding: ms(1);
+				}
+			}
+		}
+	}
+}

inc/admin/class-storefront-admin.php

@@ -72,7 +72,7 @@ public function storefront_welcome_screen() {
 					<ul>
 						<li><a href="https://wordpress.org/support/theme/storefront" target="_blank"><?php esc_attr_e( 'Support', 'storefront' ); ?></a></li>
 						<li><a href="https://docs.woocommerce.com/documentation/themes/storefront/" target="_blank"><?php esc_attr_e( 'Documentation', 'storefront' ); ?></a></li>
-						<li><a href="https://storefront.wordpress.com" target="_blank"><?php esc_attr_e( 'Development blog', 'storefront' ); ?></a></li>
+						<li><a href="https://woocommerce.wordpress.com/category/storefront/" target="_blank"><?php esc_attr_e( 'Development blog', 'storefront' ); ?></a></li>
 					</ul>
 				</section>
 

inc/woocommerce/class-storefront-woocommerce.php

@@ -24,20 +24,23 @@ class Storefront_WooCommerce {
 		 * @since 1.0
 		 */
 		public function __construct() {
-			add_filter( 'body_class', 								array( $this, 'woocommerce_body_class' ) );
-			add_action( 'wp_enqueue_scripts', 						array( $this, 'woocommerce_scripts' ),	20 );
-			add_filter( 'woocommerce_enqueue_styles', 				'__return_empty_array' );
+			add_filter( 'body_class',                               array( $this, 'woocommerce_body_class' ) );
+			add_action( 'wp_enqueue_scripts',                       array( $this, 'woocommerce_scripts' ),	20 );
+			add_filter( 'woocommerce_enqueue_styles',               '__return_empty_array' );
 			add_filter( 'woocommerce_output_related_products_args', array( $this, 'related_products_args' ) );
-			add_filter( 'woocommerce_product_thumbnails_columns', 	array( $this, 'thumbnail_columns' ) );
-			add_filter( 'loop_shop_per_page', 						array( $this, 'products_per_page' ) );
+			add_filter( 'woocommerce_product_thumbnails_columns',   array( $this, 'thumbnail_columns' ) );
 			add_filter( 'woocommerce_breadcrumb_defaults',          array( $this,'change_breadcrumb_delimiter' ) );
 
 			if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '2.5', '<' ) ) {
-				add_action( 'wp_footer', 							array( $this, 'star_rating_script' ) );
+				add_action( 'wp_footer',                            array( $this, 'star_rating_script' ) );
+			}
+
+			if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
+				add_filter( 'loop_shop_per_page',                   array( $this, 'products_per_page' ) );
 			}
 
 			// Integrations.
-			add_action( 'wp_enqueue_scripts', 						array( $this, 'woocommerce_integrations_scripts' ), 99 );
+			add_action( 'wp_enqueue_scripts',                       array( $this, 'woocommerce_integrations_scripts' ), 99 );
 			add_action( 'wp_enqueue_scripts',                       array( $this, 'add_customizer_css' ), 140 );
 
 			add_action( 'after_switch_theme',                       array( $this, 'set_storefront_style_theme_mods' ) );
@@ -159,18 +162,11 @@ public function thumbnail_columns() {
 		/**
 		 * Products per page
 		 *
+		 * @return integer number of products
 		 * @since  1.0.0
-		 * @param  integer $number number of products
-		 * @return integer         number of products
 		 */
-		public function products_per_page( $number ) {
-
-			// Default number of products if < WooCommerce 3.3.
-			if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.3', '<' ) ) {
-				$number = 12;
-			}
-
-			return absint( apply_filters( 'storefront_products_per_page', $number ) );
+		public function products_per_page() {
+			return intval( apply_filters( 'storefront_products_per_page', 12 ) );
 		}
 
 		/**

languages/storefront.pot

@@ -2,16 +2,16 @@
 # This file is distributed under the GNU General Public License v2 or later.=!>
 msgid ""
 msgstr ""
-"Project-Id-Version: Storefront 2.2.7\n"
+"Project-Id-Version: Storefront 2.2.8\n"
 "Report-Msgid-Bugs-To: https://github.com/woothemes/storefront/issues\n"
-"POT-Creation-Date: 2018-01-23 13:59:35+00:00\n"
+"POT-Creation-Date: 2018-02-12 22:12:30+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2018-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
-"X-Generator: grunt-wp-i18n1.0.0\n"
+"X-Generator: grunt-wp-i18n1.0.1\n"
 
 #: 404.php:19
 msgid "Oops! That page can&rsquo;t be found."

package.json

@@ -1,7 +1,7 @@
 {
   "name": "storefront",
   "title": "Storefront",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "homepage": "http://woocommerce.com/storefront/",
   "repository": {
     "type": "git",

style.scss

@@ -4,7 +4,7 @@ Theme URI:    	https://woocommerce.com/storefront
 Author:         Automattic
 Author URI:     https://woocommerce.com/
 Description:  	Storefront is the perfect theme for your next WooCommerce project. Designed and developed by WooCommerce Core developers, it features a bespoke integration with WooCommerce itself plus many of the most popular customer facing WooCommerce extensions. There are several layout & color options to personalise your shop, multiple widget regions, a responsive design and much more. Developers will love it's lean and extensible codebase making it a joy to customize and extend. Looking for a WooCommerce theme? Look no further!
-Version:      	2.2.7
+Version:      	2.2.8
 License:      	GNU General Public License v2 or later
 License URI:  	http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain:  	storefront