Skip to content

Commit 1364680

Browse files
author
[email protected]
committed
Merge branch 'develop' into feat/new-design-library
2 parents a593090 + e697773 commit 1364680

File tree

11 files changed

+3035
-2868
lines changed

11 files changed

+3035
-2868
lines changed

‎languages/stackable-ultimate-gutenberg-blocks.pot‎

Lines changed: 2837 additions & 2824 deletions
Large diffs are not rendered by default.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stackable",
3-
"version": "3.16.2",
3+
"version": "3.16.3",
44
"private": true,
55
"description": "Blocks for everyone",
66
"author": "Benjamin Intal of Gambit",

‎plugin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Author: Gambit Technologies, Inc
77
* Author URI: http://gambit.ph
88
* Text Domain: stackable-ultimate-gutenberg-blocks
9-
* Version: 3.16.2
9+
* Version: 3.16.3
1010
*
1111
* @package Stackable
1212
*/
@@ -24,7 +24,7 @@
2424

2525
defined( 'STACKABLE_SHOW_PRO_NOTICES' ) || define( 'STACKABLE_SHOW_PRO_NOTICES', true );
2626
defined( 'STACKABLE_BUILD' ) || define( 'STACKABLE_BUILD', 'free' );
27-
defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.16.2' );
27+
defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.16.3' );
2828
defined( 'STACKABLE_FILE' ) || define( 'STACKABLE_FILE', __FILE__ );
2929
defined( 'STACKABLE_I18N' ) || define( 'STACKABLE_I18N', 'stackable-ultimate-gutenberg-blocks' ); // Plugin slug.
3030
defined( 'STACKABLE_DESIGN_LIBRARY_URL' ) || define( 'STACKABLE_DESIGN_LIBRARY_URL', 'https://storage.googleapis.com/stackable-plugin-assets' ); // Design Library CDN URL

‎readme.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: blocks, gutenberg, gutenberg blocks, page builder, WordPress blocks
44
Requires at least: 6.5.5
55
Tested up to: 6.8.1
66
Requires PHP: 7.3
7-
Stable tag: 3.16.2
7+
Stable tag: 3.16.3
88
License: GPLv3
99
License URI: https://www.gnu.org/licenses/gpl-3.0.html
1010

@@ -311,6 +311,13 @@ Nope. Stackable only works with Gutenberg, the new WordPress editor.
311311

312312
== Changelog ==
313313

314+
= 3.16.3 =
315+
* Fixed: Using preset values with shadows will cause the preset value to reset on editor refresh #3538
316+
* Fixed: Color Schemes - container colors now do not inherit the background color scheme #3534
317+
* Fixed: Color Schemes - added setting to use old inheriting background color scheme behavior #3534
318+
* Fixed: Columns block - fixed visual outline of column picker #dca1aa5
319+
* Fixed: Corrected size of some icons in the block toolbar alignment button #4dd1872
320+
314321
= 3.16.2 =
315322
* Fixed: Clicking on certain portions of the editor scrolls the editor downward #3520 #3529
316323
* Fixed: Global settings - some themes produce an error in the editor #3532

‎src/block-components/image/edit.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ export const IMAGE_SHADOWS = [
4444
'none',
4545
'0px 0 1px #78787880',
4646
'0px 0 2px #78787880',
47-
'0px 5px 10px #99999959',
47+
'0px 5px 10px #9999995a',
4848
'0px 2px 20px #99999933',
49-
'25px 10px 30px #123f524c',
49+
'25px 10px 30px #123f524d',
5050
'0px 10px 30px #0000001a',
51-
'7px 5px 30px #48497926',
51+
'7px 5px 30px #48497927',
5252
'0px 10px 60px #0000001a',
53-
'70px 60px 60px #48497933 ',
53+
'70px 60px 60px #48497933',
5454
]
5555

5656
const Controls = props => {

‎src/block-components/separator/edit.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ const SEPARATOR_SHADOWS = [
3434
'0px 0 1px #78787880',
3535
'0px 0 2px #78787880',
3636
'2px 4px 6px #000', // This is a dark shadow similar to the shadow we used by default in v2.
37-
'0px 5px 10px #99999959',
37+
'0px 5px 10px #9999995a',
3838
'0px 2px 20px #99999933',
39-
'25px 10px 30px #123f524c',
39+
'25px 10px 30px #123f524d',
4040
'0px 10px 30px #0000000d',
41-
'7px 5px 30px #48497926',
41+
'7px 5px 30px #48497927',
4242
'0px 10px 60px #0000001a',
43-
'70px 130px -60px #48497961 ',
43+
'70px 130px -60px #48497961',
4444
]
4545

4646
const SeparatorControls = props => {

‎src/block-components/typography/edit.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ const TYPOGRAPHY_SHADOWS = [
3939
'2px 4px 5px #00000066',
4040
'0px 0px 5px #00000066',
4141
'4px 4px 0px #000000ff',
42-
'0px 15px 14px #123f524c',
43-
'25px 10px 14px #123f524c',
44-
'25px 10px 30px #123f524c',
42+
'0px 15px 14px #123f524d',
43+
'25px 10px 14px #123f524d',
44+
'25px 10px 30px #123f524d',
4545
'0px 0px 40px #123f5299',
4646
'0px 0px 62px #47494fff',
4747
'0px 0px 100px #47494fff',

‎src/components/advanced-toolbar-control/index.js‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,116 +36,116 @@ const FLEX_HORIZONTAL_ALIGN_OPTIONS = [
3636
{
3737
value: 'flex-start',
3838
title: __( 'Start', i18n ),
39-
icon: <SVGIconLeft />,
39+
icon: <SVGIconLeft width="24" height="24" />,
4040
},
4141
{
4242
value: 'center',
4343
title: __( 'Center', i18n ),
44-
icon: <SVGIconHorizontalCenter />,
44+
icon: <SVGIconHorizontalCenter width="24" height="24" />,
4545
},
4646
{
4747
value: 'flex-end',
4848
title: __( 'End', i18n ),
49-
icon: <SVGIconRight />,
49+
icon: <SVGIconRight width="24" height="24" />,
5050
},
5151
{
5252
value: 'space-between',
5353
title: __( 'Space Between', i18n ),
54-
icon: <SVGIconSpaceBetween />,
54+
icon: <SVGIconSpaceBetween width="24" height="24" />,
5555
},
5656
{
5757
value: 'space-around',
5858
title: __( 'Space Around', i18n ),
59-
icon: <SVGIconSpaceAround />,
59+
icon: <SVGIconSpaceAround width="24" height="24" />,
6060
},
6161
{
6262
value: 'space-evenly',
6363
title: __( 'Space Evenly', i18n ),
64-
icon: <SVGIconSpaceEvenly />,
64+
icon: <SVGIconSpaceEvenly width="24" height="24" />,
6565
},
6666
]
6767

6868
const FLEX_HORIZONTAL_ALIGN_OPTIONS_ALT = [
6969
{
7070
value: 'flex-start',
7171
title: __( 'Start', i18n ),
72-
icon: <SVGIconLeft />,
72+
icon: <SVGIconLeft width="24" height="24" />,
7373
},
7474
{
7575
value: 'center',
7676
title: __( 'Center', i18n ),
77-
icon: <SVGIconHorizontalCenter />,
77+
icon: <SVGIconHorizontalCenter width="24" height="24" />,
7878
},
7979
{
8080
value: 'flex-end',
8181
title: __( 'End', i18n ),
82-
icon: <SVGIconRight />,
82+
icon: <SVGIconRight width="24" height="24" />,
8383
},
8484
{
8585
value: 'space-between',
8686
title: __( 'Space Between', i18n ),
87-
icon: <SVGIconSpaceBetween />,
87+
icon: <SVGIconSpaceBetween width="24" height="24" />,
8888
},
8989
]
9090

9191
const FLEX_VERTICAL_ALIGN_OPTIONS = [
9292
{
9393
value: 'flex-start',
9494
title: __( 'Start', i18n ),
95-
icon: <SVGIconTop />,
95+
icon: <SVGIconTop width="24" height="24" />,
9696
},
9797
{
9898
value: 'center',
9999
title: __( 'Center', i18n ),
100-
icon: <SVGIconVerticalCenter />,
100+
icon: <SVGIconVerticalCenter width="24" height="24" />,
101101
},
102102
{
103103
value: 'flex-end',
104104
title: __( 'End', i18n ),
105-
icon: <SVGIconBottom />,
105+
icon: <SVGIconBottom width="24" height="24" />,
106106
},
107107
{
108108
value: 'stretch',
109109
title: __( 'Stretch', i18n ),
110-
icon: <SVGIconStretch />,
110+
icon: <SVGIconStretch width="24" height="24" />,
111111
},
112112
{
113113
value: 'baseline',
114114
title: __( 'Baseline', i18n ),
115-
icon: <SVGIconVerticalBaseline />,
115+
icon: <SVGIconVerticalBaseline width="24" height="24" />,
116116
},
117117
]
118118

119119
const FLEX_VERTICAL_JUSTIFY_OPTIONS = [
120120
{
121121
value: 'flex-start',
122122
title: __( 'Start', i18n ),
123-
icon: <SVGIconTop />,
123+
icon: <SVGIconTop width="24" height="24" />,
124124
},
125125
{
126126
value: 'center',
127127
title: __( 'Center', i18n ),
128-
icon: <SVGIconVerticalCenter />,
128+
icon: <SVGIconVerticalCenter width="24" height="24" />,
129129
},
130130
{
131131
value: 'flex-end',
132132
title: __( 'End', i18n ),
133-
icon: <SVGIconBottom />,
133+
icon: <SVGIconBottom width="24" height="24" />,
134134
},
135135
{
136136
value: 'space-between',
137137
title: __( 'Space Between', i18n ),
138-
icon: <SVGIconSpaceBetween style={ { transform: 'rotate(90deg)' } } />,
138+
icon: <SVGIconSpaceBetween style={ { transform: 'rotate(90deg)' } } width="24" height="24" />,
139139
},
140140
{
141141
value: 'space-around',
142142
title: __( 'Space Around', i18n ),
143-
icon: <SVGIconSpaceAround style={ { transform: 'rotate(90deg)' } } />,
143+
icon: <SVGIconSpaceAround style={ { transform: 'rotate(90deg)' } } width="24" height="24" />,
144144
},
145145
{
146146
value: 'space-evenly',
147147
title: __( 'Space Evenly', i18n ),
148-
icon: <SVGIconSpaceEvenly style={ { transform: 'rotate(90deg)' } } />,
148+
icon: <SVGIconSpaceEvenly style={ { transform: 'rotate(90deg)' } } width="24" height="24" />,
149149
},
150150
]
151151

@@ -158,30 +158,30 @@ const HORIZONTAL_ALIGN_OPTIONS = [
158158
{
159159
value: 'center',
160160
title: __( 'Center', i18n ),
161-
icon: <SVGIconHorizontalCenter />,
161+
icon: <SVGIconHorizontalCenter width="24" height="24" />,
162162
},
163163
{
164164
value: 'flex-end',
165165
title: __( 'Right', i18n ),
166-
icon: <SVGIconRight />,
166+
icon: <SVGIconRight width="24" height="24" />,
167167
},
168168
]
169169

170170
const VERTICAL_ALIGN_OPTIONS = [
171171
{
172172
value: 'flex-start',
173173
title: __( 'Top', i18n ),
174-
icon: <SVGIconTop />,
174+
icon: <SVGIconTop width="24" height="24" />,
175175
},
176176
{
177177
value: 'center',
178178
title: __( 'Center', i18n ),
179-
icon: <SVGIconVerticalCenter />,
179+
icon: <SVGIconVerticalCenter width="24" height="24" />,
180180
},
181181
{
182182
value: 'flex-end',
183183
title: __( 'Bottom', i18n ),
184-
icon: <SVGIconBottom />,
184+
icon: <SVGIconBottom width="24" height="24" />,
185185
},
186186
]
187187

‎src/components/columns-width-control/editor.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
.ugb-columns-width-control__reset {
2020
text-transform: none;
2121
}
22+
.components-radio-control__input {
23+
min-width: 0 !important;
24+
width: 0 !important;
25+
position: absolute !important;
26+
}
2227
}
2328

2429
.stk-column-widths-control__columns-slider {

0 commit comments

Comments
 (0)