Merge branch 'develop' into fix/3176-adv-shadow-color

.github/workflows/php-5.6.39.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        wp-versions: ['6.0.2']
+        wp-versions: ['6.2.4']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/php-7.3.5.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        wp-versions: ['6.0.2']
+        wp-versions: ['6.2.4']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/php-8.0.0.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        wp-versions: ['6.0.2']
+        wp-versions: ['6.2.4']
 
     steps:
     - uses: actions/checkout@v2

plugin.php

@@ -42,11 +42,11 @@
 	 * @since 1.9
 	 */
 	function stackable_php_requirement_activation_check() {
-		if ( version_compare( PHP_VERSION, '5.3.0', '<' ) ) {
+		if ( version_compare( PHP_VERSION, '7.3.0', '<' ) ) {
 			deactivate_plugins( basename( __FILE__ ) );
 			wp_die(
 				sprintf(
-					__( '%s"Stackable" can not be activated. %s It requires PHP version 5.3.0 or higher, but PHP version %s is used on the site. Please upgrade your PHP version first ✌️ %s Back %s', STACKABLE_I18N ),
+					__( '%s"Stackable" can not be activated. %s It requires PHP version 7.3.0 or higher, but PHP version %s is used on the site. Please upgrade your PHP version first ✌️ %s Back %s', STACKABLE_I18N ),
 					'<strong>',
 					'</strong><br><br>',
 					PHP_VERSION,
@@ -65,12 +65,12 @@ function stackable_php_requirement_activation_check() {
  *
  * @since 1.9
  */
-if ( version_compare( PHP_VERSION, '5.3.0', '<' ) ) {
+if ( version_compare( PHP_VERSION, '7.3.0', '<' ) ) {
 	if ( ! function_exists( 'stackable_php_requirement_notice' ) ) {
 		function stackable_php_requirement_notice() {
 	        printf(
 	            '<div class="notice notice-error"><p>%s</p></div>',
-	            sprintf( __( '"Stackable" requires PHP version 5.3.0 or higher, but PHP version %s is used on the site.', STACKABLE_I18N ), PHP_VERSION )
+	            sprintf( __( '"Stackable" requires PHP version 7.3.0 or higher, but PHP version %s is used on the site.', STACKABLE_I18N ), PHP_VERSION )
 	        );
 		}
 	}

src/block-components/separator/style.scss

@@ -7,7 +7,13 @@
 		}
 
 		.stk-separator ~ *:not(.stk-separator, .stk-video-background) {
-			z-index: 5;
+			z-index: 3;
+			position: relative;
+		}
+	}
+	&.stk-has-bottom-separator:not(.stk-has-top-separator) {
+		> *:not(.stk-separator, .stk-video-background) {
+			z-index: 3;
 			position: relative;
 		}
 	}

src/block/feature-grid/deprecated.js

@@ -20,6 +20,28 @@ import {
  */
 import { addFilter } from '@wordpress/hooks'
 
+// Version 3.13.3 Deprecations
+addFilter( 'stackable.feature-grid.save.blockClassNames', 'stackable/3.13.3', ( output, props ) => {
+	if ( compareVersions( props.version, '3.13.3' ) === 1 ) {
+		return output
+	}
+
+	const separatorClass = getSeparatorClasses( props.attributes )
+	const responsiveClass = getResponsiveClasses( props.attributes )
+
+	const classnames = [
+		props.className,
+		'stk-block-feature-grid',
+		responsiveClass,
+		separatorClass,
+	]
+
+	if ( props.attributes.columnWrapDesktop ) {
+		classnames.push( 'stk--column-wrap-desktop' )
+	}
+	return classnames
+} )
+
 // Version 3.1.0 Deprecations
 addFilter( 'stackable.feature-grid.save.blockClassNames', 'stackable/3.1.0', ( output, props ) => {
 	if ( compareVersions( props.version, '3.1.0' ) === 1 ) {

src/block/feature-grid/edit.js

@@ -68,7 +68,9 @@ const Edit = props => {
 		rowClass,
 		separatorClass,
 		columnTooltipClass,
-	] )
+	], {
+		'stk--column-wrap-desktop': props.attributes.columnWrapDesktop,
+	} )
 
 	const contentClassNames = classnames( [
 		'stk-inner-blocks',

src/block/feature-grid/save.js

@@ -45,6 +45,9 @@ export const Save = props => {
 				'stk-block-columns', // We need to add the columns class to make fit all and column gap to work properly.
 				responsiveClass,
 				separatorClass,
+				{
+					'stk--column-wrap-desktop': attributes.columnWrapDesktop,
+				},
 			],
 		], props )
 	)

src/block/feature-grid/style.scss

@@ -1 +1,6 @@
 @import "common";
+
+.stk-block-feature-grid.stk--column-wrap-desktop .stk--flex > .stk-block-column,
+.stk-block-feature-grid.stk--column-wrap-desktop .stk--flex > * > * > [data-type="stackable/column"] {
+	flex: var(--stk-flex-grow, 1) 1 calc(100% - var(--stk-column-gap, 0px) * 0 / 1) !important;
+}