Merge pull request #458 from tomusborne/release/3.2.1

Release: 3.2.1
tomusborne · Oct 27, 2022 · 08ca5b2 · 08ca5b2
2 parents 4895a2e + 329454b
commit 08ca5b2
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/assets/css/admin/editor-typography.css b/assets/css/admin/editor-typography.css
@@ -20,8 +20,7 @@ h1, h2, h3, h4, h5, h6 {
 	font-weight: inherit;
 }
 
-h1,
-.editor-post-title__input {
+h1 {
 	font-family: inherit;
 	font-size: 42px;
 	margin-bottom: 20px;

diff --git a/assets/dist/customizer.asset.php b/assets/dist/customizer.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '799faa7f09d874497fa43aed7476064a');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '89a3305075b3f93799d6a1ca78b75a14');
diff --git a/assets/dist/customizer.js b/assets/dist/customizer.js
diff --git a/functions.php b/functions.php
@@ -12,7 +12,7 @@
 }
 
 // Set our theme version.
-define( 'GENERATE_VERSION', '3.2.0' );
+define( 'GENERATE_VERSION', '3.2.1' );
 
 if ( ! function_exists( 'generate_setup' ) ) {
 	add_action( 'after_setup_theme', 'generate_setup' );

diff --git a/inc/class-html-attributes.php b/inc/class-html-attributes.php
@@ -479,7 +479,7 @@ public function woocommerce_content( $attributes ) {
 				$type = apply_filters( 'generate_article_itemtype', 'CreativeWork' );
 
 				$attributes['itemtype'] = sprintf(
-					'itemtype="https://schema.org/%s"',
+					'https://schema.org/%s',
 					$type
 				);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generatepress",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "A super lightweight WordPress theme.",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/readme.txt b/readme.txt
@@ -6,7 +6,7 @@ License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Tags: two-columns, three-columns, one-column, right-sidebar, left-sidebar, footer-widgets, blog, e-commerce, flexible-header, full-width-template, buddypress, custom-header, custom-background, custom-menu, custom-colors, sticky-post, threaded-comments, translation-ready, rtl-language-support, featured-images, theme-options
 Requires at least: 5.2
 Tested up to: 6.1
-Stable tag: 3.2.0
+Stable tag: 3.2.1
 
 GeneratePress is a lightweight WordPress theme built with a focus on speed and usability.
 
@@ -99,6 +99,14 @@ MIT License: https://github.com/JedWatson/react-select/blob/master/LICENSE
 
 == Changelog ==
 
+= 3.2.1 =
+
+Release date: October 27, 2022
+
+* Fix: WooCommerce single product schema itemtype
+* Fix: Post title font properties in the editor
+* Fix: Error in Customizer when Google Fonts disabled
+
 = 3.2.0 =
 
 Release date: October 25, 2022

diff --git a/sass/editor-typography.scss b/sass/editor-typography.scss
@@ -20,8 +20,7 @@ h1, h2, h3, h4, h5, h6 {
 	font-weight: inherit;
 }
 
-h1,
-.editor-post-title__input {
+h1 {
 	font-family: inherit;
 	font-size: 42px;
 	margin-bottom: 20px;

diff --git a/src/customizer-controls/font-manager/GeneratePressFontManagerControlForm.js b/src/customizer-controls/font-manager/GeneratePressFontManagerControlForm.js
@@ -90,7 +90,7 @@ const GeneratePressFontManagerControlForm = ( props ) => {
 	}
 
 	fonts.forEach( ( font ) => {
-		const index = font.googleFont ? 1 : 0;
+		const index = font.googleFont && generateCustomizerControls.showGoogleFonts && googleFontOptions.length > 0 ? 1 : 0;
 
 		fontFamilies[ index ].options = fontFamilies[ index ].options.filter( ( obj ) => obj.value !== font.fontFamily );
 	} );
@@ -116,7 +116,7 @@ const GeneratePressFontManagerControlForm = ( props ) => {
 
 						handleChangeComplete( fontValues );
 
-						if ( typeof googleFonts[ value ] !== 'undefined' ) {
+						if ( typeof googleFonts[ value ] !== 'undefined' && generateCustomizerControls.showGoogleFonts ) {
 							fontValues[ index ] = {
 								...fontValues[ index ],
 								googleFont: true,
@@ -226,7 +226,7 @@ const GeneratePressFontManagerControlForm = ( props ) => {
 											onChange={ onFontShortcut }
 										/>
 
-										{ !! fonts[ index ].fontFamily &&
+										{ !! fonts[ index ].fontFamily && !! generateCustomizerControls.showGoogleFonts &&
 											<div className="generate-font-manager--options">
 												<ToggleControl
 													className="generate-font-manager-google-font--field"

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://generatepress.com
 Author: Tom Usborne
 Author URI: https://tomusborne.com
 Description: GeneratePress is a lightweight WordPress theme built with a focus on speed and usability. Performance is important to us, which is why a fresh GeneratePress install adds less than 10kb (gzipped) to your page size. We take full advantage of the block editor (Gutenberg), which gives you more control over creating your content. If you use page builders, GeneratePress is the right theme for you. It is completely compatible with all major page builders, including Beaver Builder and Elementor. Thanks to our emphasis on WordPress coding standards, we can boast full compatibility with all well-coded plugins, including WooCommerce. GeneratePress is fully responsive, uses valid HTML/CSS, and is translated into over 25 languages by our amazing community of users. A few of our many features include 60+ color controls, powerful dynamic typography, 5 navigation locations, 5 sidebar layouts, dropdown menus (click or hover), and 9 widget areas. Learn more and check out our powerful premium version at https://generatepress.com
-Version: 3.2.0
+Version: 3.2.1
 Requires at least: 5.2
 Tested up to: 6.1
 Requires PHP: 5.6
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '799faa7f09d874497fa43aed7476064a');
		<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '89a3305075b3f93799d6a1ca78b75a14');