Skip to content

Commit

Permalink
Merge branch 'develop' into fix/performance-cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mxkae committed Oct 11, 2024
2 parents b911674 + d4f76c7 commit 4d8871e
Show file tree
Hide file tree
Showing 8 changed files with 1,666 additions and 1,649 deletions.
3,258 changes: 1,629 additions & 1,629 deletions languages/stackable-ultimate-gutenberg-blocks.pot

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stackable",
"version": "3.13.8",
"version": "3.13.9",
"private": true,
"description": "Blocks for everyone",
"author": "Benjamin Intal of Gambit",
Expand Down
4 changes: 2 additions & 2 deletions plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Author: Gambit Technologies, Inc
* Author URI: http://gambit.ph
* Text Domain: stackable-ultimate-gutenberg-blocks
* Version: 3.13.8
* Version: 3.13.9
*
* @package Stackable
*/
Expand All @@ -24,7 +24,7 @@

defined( 'STACKABLE_SHOW_PRO_NOTICES' ) || define( 'STACKABLE_SHOW_PRO_NOTICES', true );
defined( 'STACKABLE_BUILD' ) || define( 'STACKABLE_BUILD', 'free' );
defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.13.8' );
defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.13.9' );
defined( 'STACKABLE_FILE' ) || define( 'STACKABLE_FILE', __FILE__ );
defined( 'STACKABLE_I18N' ) || define( 'STACKABLE_I18N', 'stackable-ultimate-gutenberg-blocks' ); // Plugin slug.
defined( 'STACKABLE_DESIGN_LIBRARY_URL' ) || define( 'STACKABLE_DESIGN_LIBRARY_URL', 'https://storage.googleapis.com/stackable-plugin-assets' ); // Design Library CDN URL
Expand Down
8 changes: 7 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: blocks, gutenberg, gutenberg blocks, page builder, WordPress blocks
Requires at least: 6.3
Tested up to: 6.6.2
Requires PHP: 7.3
Stable tag: 3.13.8
Stable tag: 3.13.9
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -295,6 +295,12 @@ Nope. Stackable only works with Gutenberg, the new WordPress editor.

== Changelog ==

= 3.13.9 =
* Fixed: Text blocks: text gradient color doesn't show for misspelled words #3305
* Fixed: Button block: adding a button block now places the cursor inside the button ##3324
* Fixed: Conditional display: inspector options do not re-render when changing values #3342
* Fixed: Optimized CSS: mobile styles can overwrite tablet styles sometimes (to fix, please re-save the page) #3345

= 3.13.8 =
* Fixed: Possible editor freezing when using deprecated icon lists inside patterns #3332
* Fixed: Timeline block: last timeline doesn't cut off in mobile view (part 2 of fix) #3292
Expand Down
19 changes: 9 additions & 10 deletions src/block/button-group/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,15 @@ const Edit = props => {
<CustomCSS mainBlockClass="stk-block-button-group" />

{ ! hasInnerBlocks && <GroupPlaceholder blockName="stackable/button" /> }
{ hasInnerBlocks &&
<div className={ contentClassNames }>
<InnerBlocks
orientation="horizontal"
allowedBlocks={ ALLOWED_INNER_BLOCKS }
template={ TEMPLATE }
templateInsertUpdatesSelection={ true }
/>
</div>
}
<div className={ contentClassNames }>
<InnerBlocks
orientation="horizontal"
allowedBlocks={ ALLOWED_INNER_BLOCKS }
template={ TEMPLATE }
templateInsertUpdatesSelection={ true }
renderAppender={ hasInnerBlocks ? undefined : false }
/>
</div>
</BlockDiv>
{ props.isHovered && hasInnerBlocks && <MarginBottom /> }
</>
Expand Down
7 changes: 1 addition & 6 deletions src/block/button-group/variations.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ const variations = [
'stk-type': 'essential',
'stk-demo': 'https://wpstackable.com/button-block/?utm_source=welcome&utm_medium=settings&utm_campaign=view_demo&utm_content=demolink',
isDefault: true,
innerBlocks: [
[
'stackable/button',
{},
],
],
innerBlocks: [],
example: buttonExample,
},
{
Expand Down
1 change: 1 addition & 0 deletions src/css-optimize.php
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ public static function generate_css( $styles ) {

foreach ( $style_matches[1] as $i => $media_query ) {
$media_query = ! empty( $media_query ) ? substr( $media_query, 0, -1 ) : $media_query;
$media_query = str_replace( 'width: ', 'width:', $media_query ); // Ensure that the media query is consistent.
$selector = $style_matches[2][ $i ];
$style_rule = $style_matches[3][ $i ];

Expand Down
16 changes: 16 additions & 0 deletions src/styles/editor-block.scss
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,22 @@
margin-top: 0;
}

// Typography
// ::spelling-error is not supported by Firefox so we need to separate it to prevent the style rule above from being invalid
// and because :is() does not allow pseudo-elements inside it.
.stk--is-gradient::spelling-error,
.stk--is-gradient li::spelling-error,
.stk--is-gradient span::spelling-error,
.stk--is-gradient a::spelling-error {
background-clip: text;
-webkit-background-clip: text;
-moz-background-clip: text;
-o-background-clip: text;
-webkit-text-fill-color: transparent;
-moz-text-fill-color: transparent;
-o-text-fill-color: transparent;
}

// Deprecated styles.
@import "deprecated-editor-block";

Expand Down

0 comments on commit 4d8871e

Please sign in to comment.