Skip to content

Commit 189a73e

Browse files
committed
Merge branch 'feat/size-control-steps' of https://github.com/gambitph/Stackable into feat/size-control-steps
2 parents 9e2ee7d + 1291164 commit 189a73e

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

e2e/tests/global-settings.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ test.describe( 'Global Settings', () => {
7878
expect( _count ).toBeLessThan( count )
7979
} )
8080

81-
test( 'Global Typography Styles should be applied when adding a heading', async ( {
81+
test.skip( 'Global Typography Styles should be applied when adding a heading', async ( {
8282
page,
8383
editor,
8484
} ) => {

src/block/columns/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
// Target the stk-column-wrapper to also include blocks with column innerblocks
3636
// but are not columns (no stk-block-columns), like accordion and horizontal scroller.
3737
:where(.stk-block-columns) {
38-
@for $i from 1 through 20 {
38+
@for $i from 1 through 40 {
3939
--stk-col-order-#{ $i }: #{ $i };
4040
}
4141
}
4242

4343
// Column order.
44-
@for $i from 1 through 20 {
44+
@for $i from 1 through 40 {
4545
.stk-block-column:nth-child(#{ $i }) {
4646
order: var(--stk-col-order-#{ $i }, initial);
4747
}

src/welcome/admin.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,6 +1171,8 @@ const GlobalSettings = props => {
11711171
props.handleSettingsChange( { stackable_use_size_presets_by_default: value } ) // eslint-disable-line camelcase
11721172
} }
11731173
help={ __( 'If enabled, range controls will be on preset mode by default.', i18n ) }
1174+
disabled={ __( 'Use custom values', i18n ) }
1175+
enabled={ __( 'Use presets', i18n ) }
11741176
/>
11751177
</div>
11761178
}

0 commit comments

Comments
 (0)