2.0.4

woocommerce · May 11, 2016 · e095ffb · e095ffb
1 parent 3431316
commit e095ffb
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/inc/class-boutique-customizer.php b/inc/class-boutique-customizer.php
@@ -25,9 +25,13 @@ public function __construct() {
 
 		add_action( 'wp_enqueue_scripts', 	array( $this, 'add_customizer_css' ),						1000 );
 		add_action( 'customize_register', 	array( $this, 'edit_default_controls' ),					99 );
-		add_action( 'customize_register',	array( $this, 'edit_default_customizer_settings' ),			99 );
-		add_action( 'init',					array( $this, 'default_theme_mod_values' )					);
+		add_filter( 'storefront_setting_default_values', array( $this, 'get_boutique_defaults' ) );
 
+		/**
+		 * The following can be removed when Storefront 2.1 lands
+		 */
+		add_action( 'init',					array( $this, 'default_theme_mod_values' )					);
+		add_action( 'customize_register',	array( $this, 'edit_default_customizer_settings' ),			99 );
 		if ( version_compare( $storefront_version, '2.0.0', '<' ) ) {
 			add_action( 'init',				array( $this, 'default_theme_settings' ) );
 		}

diff --git a/readme.txt b/readme.txt
@@ -18,6 +18,10 @@ Boutique is a child theme for Storefront meaning that both themes must be instal
 
 == Changelog ==
 
+= 2016.05.11 -  2.0.4 =
+ * Tweak - Adopt Storefront 2.0's methods for applying default settings.
+ * Fix - Support for WordPress 4.5's custom logo feature.
+
 = 2016.04.21 - 2.0.3 =
 * Fix - Duplicated content on the homepage.
 

diff --git a/style-rtl.css b/style-rtl.css
@@ -5,7 +5,7 @@ Description:	A Storefront child theme designed for small WooCommerce stores / bo
 Author:			WooThemes
 Author URI:		http://woothemes.com
 Template:		storefront
-Version:		2.0.3
+Version:		2.0.4
 License: 		GNU General Public License v2 or later
 License URI: 	http://www.gnu.org/licenses/gpl-2.0.html
 Tags:			light, dark, two-columns, right-sidebar, responsive-layout, accessibility-ready
@@ -289,7 +289,11 @@ table.cart td.actions {
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), inset 0 -0.53em rgba(0, 0, 0, 0.05);
     background: #212121;
     clear: both; }
-  .site-branding, .site-search, .site-header-cart, .site-logo-anchor {
+  .site-branding,
+  .site-search,
+  .site-header-cart,
+  .site-logo-anchor,
+  .custom-logo-link {
     margin-bottom: 4.236em; }
   .site-header {
     padding-top: 4.236em; }

diff --git a/style.css b/style.css
@@ -5,7 +5,7 @@ Description:	A Storefront child theme designed for small WooCommerce stores / bo
 Author:			WooThemes
 Author URI:		http://woothemes.com
 Template:		storefront
-Version:		2.0.3
+Version:		2.0.4
 License: 		GNU General Public License v2 or later
 License URI: 	http://www.gnu.org/licenses/gpl-2.0.html
 Tags:			light, dark, two-columns, right-sidebar, responsive-layout, accessibility-ready
@@ -289,7 +289,11 @@ table.cart td.actions {
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), inset 0 -0.53em rgba(0, 0, 0, 0.05);
     background: #212121;
     clear: both; }
-  .site-branding, .site-search, .site-header-cart, .site-logo-anchor {
+  .site-branding,
+  .site-search,
+  .site-header-cart,
+  .site-logo-anchor,
+  .custom-logo-link {
     margin-bottom: 4.236em; }
   .site-header {
     padding-top: 4.236em; }

diff --git a/style.scss b/style.scss
@@ -5,7 +5,7 @@ Description:	A Storefront child theme designed for small WooCommerce stores / bo
 Author:			WooThemes
 Author URI:		http://woothemes.com
 Template:		storefront
-Version:		2.0.3
+Version:		2.0.4
 License: 		GNU General Public License v2 or later
 License URI: 	http://www.gnu.org/licenses/gpl-2.0.html
 Tags:			light, dark, two-columns, right-sidebar, responsive-layout, accessibility-ready
@@ -373,7 +373,11 @@ table.cart {
 		clear: both;
 	}
 
-	.site-branding, .site-search, .site-header-cart, .site-logo-anchor {
+	.site-branding,
+	.site-search,
+	.site-header-cart,
+	.site-logo-anchor,
+	.custom-logo-link {
 		margin-bottom: 4.236em;
 	}