Merge pull request #88 from tomusborne/release/2.2.2

Release/2.2.2

css/admin/block-editor.css

@@ -147,10 +147,24 @@ button.content-title-visibility:before {
 	opacity: 0.4;
 }
 
+.edit-post-text-editor .editor-post-title__block .editor-post-title__input {
+	color: initial;
+	opacity: 1;
+}
+
 /*--------------------------------------------------------------
 # Columns
 --------------------------------------------------------------*/
 
 .editor-block-list__block .wp-block-columns .wp-block-column {
 	margin-bottom: 0;
 }
+
+/*--------------------------------------------------------------
+# Fix shortcode block label color
+--------------------------------------------------------------*/
+
+.wp-block-shortcode label,
+.wp-block-shortcode .editor-plain-text {
+	color: initial;
+}

functions.php

@@ -12,7 +12,7 @@
 }
 
 // Set our theme version.
-define( 'GENERATE_VERSION', '2.2.1' );
+define( 'GENERATE_VERSION', '2.2.2' );
 
 if ( ! function_exists( 'generate_setup' ) ) {
 	add_action( 'after_setup_theme', 'generate_setup' );
@@ -35,6 +35,7 @@ function generate_setup() {
 		add_theme_support( 'customize-selective-refresh-widgets' );
 		add_theme_support( 'align-wide' );
 		add_theme_support( 'editor-color-palette', array() );
+		add_theme_support( 'responsive-embeds' );
 
 		add_theme_support( 'custom-logo', array(
 			'height' => 70,

inc/block-editor.php

@@ -116,10 +116,10 @@ function generate_enqueue_backend_block_editor_assets() {
 		generate_spacing_get_defaults()
 	);
 
-	$background_color = generate_get_option( 'background_color' );
+	$text_color = generate_get_option( 'text_color' );
 
-	if ( $color_settings['content_background_color'] ) {
-		$background_color = $color_settings['content_background_color'];
+	if ( $color_settings['content_text_color'] ) {
+		$text_color = $color_settings['content_text_color'];
 	}
 
 	wp_localize_script( 'generate-block-editor-scripts', 'generate_block_editor', array(
@@ -132,7 +132,7 @@ function generate_enqueue_backend_block_editor_assets() {
 		'content_title' => generate_get_block_editor_show_content_title() ? 'true' : 'false',
 		'disable_content_title' => esc_html( 'Disable Content Title', 'generatepress' ),
 		'show_content_title' => esc_html( 'Show Content Title', 'generatepress' ),
-		'background_color' => $background_color,
+		'text_color' => $text_color,
 	) );
 }
 
@@ -176,6 +176,9 @@ function generate_do_inline_block_editor_css() {
 		$css->add_property( 'max-width', $content_width_calc );
 	}
 
+	$css->set_selector( 'html body.gutenberg-editor-page .editor-block-list__block[data-align="full"]' );
+	$css->add_property( 'max-width', 'none' );
+
 	$css->set_selector( '.edit-post-visual-editor .editor-block-list__block[data-align=wide]' );
 	$css->add_property( 'max-width', absint( $content_width ), false, 'px' );
 
@@ -289,7 +292,7 @@ function generate_do_inline_block_editor_css() {
 	$css->add_property( 'text-transform', esc_attr( $font_settings['heading_5_transform'] ) );
 
 	if ( '' !== $font_settings['heading_5_font_size'] ) {
-		$css->add_property( 'font-size', absint( $font_settings['heading_5_font_size'] ), $og_defaults['heading_5_font_size'], 'px' );
+		$css->add_property( 'font-size', absint( $font_settings['heading_5_font_size'] ), false, 'px' );
 	} else {
 		$css->add_property( 'font-size', 'inherit' );
 	}
@@ -330,12 +333,13 @@ function generate_do_inline_block_editor_css() {
 		$css->add_property( 'font-size', absint( $font_settings['buttons_font_size'] ), false, 'px' );
 	}
 
-	$css->set_selector( 'body .edit-post-layout__content' );
+	$css->set_selector( 'body .editor-styles-wrapper' );
+	$css->add_property( 'background-color', esc_attr( generate_get_option( 'background_color' ) ) );
 
 	if ( $color_settings['content_background_color'] ) {
-		$css->add_property( 'background-color', esc_attr( $color_settings['content_background_color'] ) );
-	} else {
-		$css->add_property( 'background-color', esc_attr( generate_get_option( 'background_color' ) ) );
+		$body_background = esc_attr( generate_get_option( 'background_color' ) );
+		$content_background = esc_attr( $color_settings['content_background_color'] );
+		$css->add_property( 'background', 'linear-gradient(' . $content_background . ',' . $content_background . '), linear-gradient(' . $body_background . ',' . $body_background . ')' );
 	}
 
 	$css->set_selector( '.editor-block-list__block a, .editor-block-list__block a:visited' );

inc/css-output.php

@@ -501,7 +501,7 @@ function generate_spacing_css() {
 		$css->set_selector( '.separate-containers .inside-article, .separate-containers .comments-area, .separate-containers .page-header, .separate-containers .paging-navigation, .one-container .site-content, .inside-page-header' );
 		$css->add_property( 'padding', generate_padding_css( $spacing_settings['content_top'], $spacing_settings['content_right'], $spacing_settings['content_bottom'], $spacing_settings['content_left'] ), generate_padding_css( $og_defaults['content_top'], $og_defaults['content_right'], $og_defaults['content_bottom'], $og_defaults['content_left'] ) );
 
-		$content_padding = $spacing_settings['content_right'] + $spacing_settings['content_left'];
+		$content_padding = absint( $spacing_settings['content_right'] ) + absint( $spacing_settings['content_left'] );
 		$css->set_selector( '.entry-content .alignwide, body:not(.no-sidebar) .entry-content .alignfull' );
 		$css->add_property( 'margin-left', '-' . absint( $spacing_settings['content_left'] ) . 'px' );
 		$css->add_property( 'width', 'calc(100% + ' . absint( $content_padding ) . 'px)' );
@@ -511,7 +511,7 @@ function generate_spacing_css() {
 			$css->set_selector( '.separate-containers .inside-article, .separate-containers .comments-area, .separate-containers .page-header, .separate-containers .paging-navigation, .one-container .site-content, .inside-page-header' );
 			$css->add_property( 'padding', generate_padding_css( $spacing_settings['mobile_content_top'], $spacing_settings['mobile_content_right'], $spacing_settings['mobile_content_bottom'], $spacing_settings['mobile_content_left'] ) );
 
-			$mobile_content_padding = $spacing_settings['mobile_content_right'] + $spacing_settings['mobile_content_left'];
+			$mobile_content_padding = absint( $spacing_settings['mobile_content_right'] ) + absint( $spacing_settings['mobile_content_left'] );
 			$css->set_selector( '.entry-content .alignwide, body:not(.no-sidebar) .entry-content .alignfull' );
 			$css->add_property( 'margin-left', '-' . absint( $spacing_settings['mobile_content_left'] ) . 'px' );
 			$css->add_property( 'width', 'calc(100% + ' . absint( $mobile_content_padding ) . 'px)' );

inc/markup.php

@@ -110,7 +110,7 @@ function generate_get_microdata( $context ) {
 	}
 
 	if ( 'sidebar' === $context ) {
-		$data = 'itemtype="https://schema.org/WPSidebar" itemscope';
+		$data = 'itemtype="https://schema.org/WPSideBar" itemscope';
 	}
 
 	if ( 'footer' === $context ) {

inc/structure/navigation.php

@@ -162,7 +162,7 @@ function start_el( &$output, $page, $depth = 0, $args = array(), $current_page =
 
 			if ( isset( $args['pages_with_children'][ $page->ID ] ) ) {
 				$css_class[] = 'menu-item-has-children';
-				$button = '<span role="presentation" class="dropdown-menu-toggle" aria-expanded="false"></span>';
+				$button = '<span role="presentation" class="dropdown-menu-toggle"></span>';
 			}
 
 			if ( ! empty( $current_page ) ) {

js/admin/block-editor.js

@@ -76,10 +76,10 @@ jQuery( document ).ready( function( $ ) {
 		}
 	} );
 
-	var background_color = tinycolor( generate_block_editor.background_color ).toHex8(),
-		isDarkMode = tinycolor( background_color ).isDark();
+	var text_color = tinycolor( generate_block_editor.text_color ).toHex8(),
+		isTextDark = tinycolor( text_color ).isDark();
 
-	if ( isDarkMode ) {
+	if ( ! isTextDark ) {
 		$( 'body' ).addClass( 'is-dark-theme' );
 	}
 } );

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: 4.5
 Tested up to: 5.0
-Stable tag: 2.2.1
+Stable tag: 2.2.2
 
 GeneratePress is a lightweight WordPress theme built with a focus on speed and usability.
 
@@ -95,6 +95,20 @@ MIT License: https://github.com/bgrins/TinyColor/blob/master/LICENSE
 
 == Changelog ==
 
+= 2.2.2 =
+
+Release date: January 30, 2019
+
+* New: Add support for responsive embeds (videos etc..)
+* Fix: Background/text color conflict in block editor if content background is using rgba
+* Fix: Remove aria-expanded attribute from menu dropdown arrows when no menu is set
+* Fix: Notice in block editor when h5 font size is set
+* Fix: Notice if right/left content padding values are non-numeric
+* Fix: Microdata spelling of WPSideBar
+* Fix: Align-full alignment issue in block editor when Gutenberg plugin is active
+* Fix: Shortcode block label text color when using light text
+* Fix: Content title color in Gutenberg while in code editor
+
 = 2.2.1 =
 
 Release date: November 21, 2018

style.css

@@ -4,16 +4,16 @@ 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 15kb (gzipped) to your page size. We take full advantage of the new 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 microdata integration, 9 widget areas, 5 navigation locations, 5 sidebar layouts, dropdown menus (click or hover) and navigation color presets. Learn more and check out our powerful premium version at https://generatepress.com
-Version: 2.2.1
+Version: 2.2.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: generatepress
 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
 
-GeneratePress, Copyright 2014-2018 EDGE22 Studios LTD.
+GeneratePress, Copyright 2014-2019 EDGE22 Studios LTD.
 GeneratePress is distributed under the terms of the GNU GPL
 
-GeneratePress is based on Underscores http://underscores.me/, (C) 2012-2018 Automattic, Inc.
+GeneratePress is based on Underscores http://underscores.me/, (C) 2012-2019 Automattic, Inc.
 */
 
 /*--------------------------------------------------------------