Merge pull request #223 from bigboxwc/release/3.3.0

release/3.3.0
bigboxwc · Aug 3, 2019 · e4cba5e · e4cba5e
2 parents 0733c25 + da294be
commit e4cba5e
Show file tree

Hide file tree

Showing 23 changed files with 214 additions and 196 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.3.0] - 2019-08-03
+
+### New
+
+- WooCommerce 3.7 compatibility.
+- Updated block editor support.
+
 ## [3.2.0] - 2019-04-27
 
 ### New

diff --git a/app/customize/controls.php b/app/customize/controls.php
@@ -48,7 +48,7 @@ function bigbox_customize_controls_enqueue_scripts( $wp_customize ) {
 
 	wp_enqueue_style(
 		'bigbox-customize-controls',
-		get_template_directory_uri() . '/public/css/customize-controls.min.css',
+		get_template_directory_uri() . '/public/css/customize-controls-css.min.css',
 		[],
 		bigbox_get_theme_version()
 	);

diff --git a/app/integrations/facetwp/template-functions.php b/app/integrations/facetwp/template-functions.php
@@ -37,7 +37,7 @@ function bigbox_facetwp_wp_enqueue_scripts() {
 
 	wp_enqueue_style(
 		"{$stylesheet}-facetwp",
-		get_template_directory_uri() . '/public/css/facetwp.min.css',
+		get_template_directory_uri() . '/public/css/facetwp-css.min.css',
 		[],
 		$version
 	);

diff --git a/app/integrations/gutenberg/class-gutenberg.php b/app/integrations/gutenberg/class-gutenberg.php
@@ -68,7 +68,7 @@ public function add_theme_support() {
 		add_theme_support( 'editor-styles' );
 
 		// Add editor style.
-		add_editor_style( 'public/css/gutenberg.min.css' );
+		add_editor_style( 'public/css/gutenberg-css.min.css' );
 
 		$palette = [];
 		$colors  = bigbox_get_theme_colors();
@@ -162,6 +162,10 @@ public function inline_editor_css( $settings ) {
 		$weight_base = bigbox_get_theme_font_weight( 'base' );
 		$weight_bold = bigbox_get_theme_font_weight( 'bold' );
 
+		if ( 'default' === $family ) {
+			$family = "-apple-system, blinkmacsystemfont, 'Segoe UI', roboto, 'Helvetica Neue', arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'";
+		}
+
 		$config = [];
 
 		// Base.
@@ -173,7 +177,7 @@ public function inline_editor_css( $settings ) {
 			'declarations' => [
 				'color'       => esc_attr( $gray700 ),
 				'font-size'   => ( $size * 16 ) . 'px',
-				'font-family' => esc_attr( $family ),
+				'font-family' => $family,
 				'font-weight' => $weight_base,
 			],
 		];
@@ -215,12 +219,6 @@ public function inline_editor_css( $settings ) {
 			'selectors'    => [
 				'.editor-post-title__block .editor-post-title__input',
 				'a',
-				'h1',
-				'h2',
-				'h3',
-				'h4',
-				'h5',
-				'h6',
 			],
 			'declarations' => [
 				'color' => esc_attr( $gray800 ),
@@ -255,8 +253,7 @@ public function inline_editor_css( $settings ) {
 		}
 
 		$settings['styles'][] = [
-			'baseUrl' => null,
-			'css'     => $css->build(),
+			'css' => $css->build(),
 		];
 
 		return $settings;

diff --git a/app/integrations/woocommerce-bookings/template-functions.php b/app/integrations/woocommerce-bookings/template-functions.php
@@ -45,7 +45,7 @@ function bigbox_woocommerce_bookings_enqueue_styles() {
 
 	wp_enqueue_style(
 		$stylesheet,
-		get_template_directory_uri() . '/public/css/woocommerce-bookings.min.css',
+		get_template_directory_uri() . '/public/css/woocommerce-bookings-css.min.css',
 		[],
 		$version
 	);

diff --git a/app/integrations/woocommerce-brands/template-functions.php b/app/integrations/woocommerce-brands/template-functions.php
@@ -54,7 +54,7 @@ function bigbox_woocommerce_brands_enqueue_styles() {
 
 	wp_enqueue_style(
 		$stylesheet,
-		get_template_directory_uri() . '/public/css/woocommerce-brands.min.css',
+		get_template_directory_uri() . '/public/css/woocommerce-brands-css.min.css',
 		[],
 		$version
 	);

diff --git a/app/integrations/woocommerce-product-vendors/template-functions.php b/app/integrations/woocommerce-product-vendors/template-functions.php
@@ -44,7 +44,7 @@ function bigbox_woocommerce_product_vendors_enqueue_styles() {
 
 	wp_enqueue_style(
 		$stylesheet,
-		get_template_directory_uri() . '/public/css/woocommerce-product-vendors.min.css',
+		get_template_directory_uri() . '/public/css/woocommerce-product-vendors-css.min.css',
 		[],
 		$version
 	);

diff --git a/app/integrations/woocommerce/wc-template-functions.php b/app/integrations/woocommerce/wc-template-functions.php
@@ -30,7 +30,7 @@ function woocommerce_subcategory_thumbnail( $category ) {
 	// End modification.
 	$small_thumbnail_size = apply_filters( 'subcategory_archive_thumbnail_size', 'woocommerce_thumbnail' );
 	$dimensions           = wc_get_image_size( $small_thumbnail_size );
-	$thumbnail_id         = get_woocommerce_term_meta( $category->term_id, 'thumbnail_id', true );
+	$thumbnail_id         = get_term_meta( $category->term_id, 'thumbnail_id', true );
 
 	if ( $thumbnail_id ) {
 		$image        = wp_get_attachment_image_src( $thumbnail_id, $small_thumbnail_size );

diff --git a/app/nux/class-setup-guide.php b/app/nux/class-setup-guide.php
@@ -118,7 +118,7 @@ function( $a, $b ) {
 	public function admin_enqueue_scripts() {
 		$version = bigbox_get_theme_version();
 
-		wp_register_style( 'bigbox-nux', get_template_directory_uri() . '/public/css/nux.min.css', [], $version );
+		wp_register_style( 'bigbox-nux', get_template_directory_uri() . '/public/css/nux-css.min.css', [], $version );
 	}
 
 	/**

diff --git a/app/theme/assets.php b/app/theme/assets.php
@@ -40,7 +40,7 @@ function bigbox_enqueue_styles() {
 	// Base and dynamic styles.
 	wp_enqueue_style(
 		$stylesheet,
-		get_template_directory_uri() . '/public/css/app.min.css',
+		get_template_directory_uri() . '/public/css/app-css.min.css',
 		$deps,
 		$version
 	);