Merge pull request #104 from tomusborne/release/2.4.1

Release/2.4.1
tomusborne · Nov 26, 2019 · cd3de8b · cd3de8b
2 parents 7f9a266 + 39454a1
commit cd3de8b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 20 deletions.
diff --git a/css/admin/block-editor.css b/css/admin/block-editor.css
@@ -88,15 +88,10 @@ body .editor-default-block-appender textarea.editor-default-block-appender__cont
 --------------------------------------------------------------*/
 
 .editor-block-list__layout .wp-block-gallery li figcaption {
-	position: absolute;
-	bottom: 0;
-	padding: 10px;
-	font-size: 80%;
-	background: rgba(255,255,255,0.3);
+	background: rgba(255, 255, 255, 0.7);
 	color: #000;
-	width: 100%;
+	padding: 10px;
 	box-sizing: border-box;
-	text-align: left; /* editor only */
 }
 
 /*--------------------------------------------------------------

diff --git a/css/all.min.css b/css/all.min.css
diff --git a/functions.php b/functions.php
@@ -12,7 +12,7 @@
 }
 
 // Set our theme version.
-define( 'GENERATE_VERSION', '2.4.0' );
+define( 'GENERATE_VERSION', '2.4.1' );
 
 if ( ! function_exists( 'generate_setup' ) ) {
 	add_action( 'after_setup_theme', 'generate_setup' );

diff --git a/inc/css-output.php b/inc/css-output.php
@@ -516,14 +516,9 @@ function generate_spacing_css() {
 		$css->set_selector( '.inside-header' );
 		$css->add_property( 'padding', generate_padding_css( $spacing_settings['header_top'], $spacing_settings['header_right'], $spacing_settings['header_bottom'], $spacing_settings['header_left'] ), generate_padding_css( $og_defaults['header_top'], $og_defaults['header_right'], $og_defaults['header_bottom'], $og_defaults['header_left'] ) );
 
-		$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->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, .wp-block-group__inner-container' );
 		$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'] ) );
 
-		if ( apply_filters( 'generate_do_group_inner_container_style', true ) ) {
-			$css->set_selector( '.wp-block-group__inner-container' );
-			$css->add_property( 'padding', generate_padding_css( $spacing_settings['content_top'], $spacing_settings['content_right'], $spacing_settings['content_bottom'], $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' );
@@ -613,7 +608,7 @@ function generate_spacing_css() {
 		$css->add_property( 'padding', generate_padding_css( $spacing_settings['footer_top'], $spacing_settings['footer_right'], $spacing_settings['footer_bottom'], $spacing_settings['footer_left'] ), generate_padding_css( $og_defaults['footer_top'], $og_defaults['footer_right'], $og_defaults['footer_bottom'], $og_defaults['footer_left'] ) );
 
 		$css->start_media_query( generate_get_media_query( 'mobile' ) );
-			$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->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, .wp-block-group__inner-container' );
 			$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 = absint( $spacing_settings['mobile_content_right'] ) + absint( $spacing_settings['mobile_content_left'] );

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: 4.5
 Tested up to: 5.3
-Stable tag: 2.4.0
+Stable tag: 2.4.1
 
 GeneratePress is a lightweight WordPress theme built with a focus on speed and usability.
 
@@ -95,6 +95,13 @@ MIT License: https://github.com/bgrins/TinyColor/blob/master/LICENSE
 
 == Changelog ==
 
+= 2.4.1 =
+
+Release date: November 26, 2019
+
+* Tweak: Use mobile content padding in Group block on mobile
+* Fix: Captions in the block editor
+
 = 2.4.0 =
 
 Release date: November 20, 2019

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 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.4.0
+Version: 2.4.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: generatepress
@@ -1672,7 +1672,8 @@ ol.comment-list {
 .separate-containers .page-header,
 .separate-containers .paging-navigation,
 .one-container .site-content,
-.inside-page-header {
+.inside-page-header,
+.wp-block-group__inner-container {
 	padding: 40px;
 }
 

diff --git a/style.min.css b/style.min.css