Skip to content

Commit 774876f

Browse files
Add @use order to .stylelintrc to be first, Ref: DEV-431
1 parent cd12edf commit 774876f

File tree

5 files changed

+51
-37
lines changed

5 files changed

+51
-37
lines changed

.stylelintrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
"customSyntax": "postcss-scss",
1515
"rules": {
1616
"order/order": [
17+
{
18+
"type": "at-rule",
19+
"name": "use"
20+
},
1721
{
1822
"type": "at-rule",
1923
"name": "import"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Update caniuse lite to 1.0.30001737, Ref: DEV-10
1111
* Upgrade gulp-sass to 6.0.1, Ref: DEV-426
1212
* Ignore merge commits from husky checks, Ref: DEV-427
13+
* Add `@use` order to .stylelintrc to be first, Ref: DEV-431
1314

1415
### 9.6.1: 2025-08-08
1516

blocks/cta/src/style.scss

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
*/
77

88
.wp-block-air-light-cta {
9+
// Import components
10+
@use '../../../sass/components/button';
11+
12+
// Import variables
13+
@use '../../../sass/variables/breakpoints';
14+
@use '../../../sass/variables/colors';
15+
@use '../../../sass/variables/typography';
16+
917
// Get colors
1018
@include colors();
1119

@@ -21,13 +29,13 @@
2129
max-width: var(--width-grid-base);
2230

2331
.container {
24-
background-color: #F2F2F2;
32+
background-color: #f2f2f2;
2533
padding: 4rem 1.25rem;
2634
}
2735

2836
h2,
2937
p {
30-
color: #222222;
38+
color: #222;
3139
}
3240

3341
h2 {
@@ -49,11 +57,11 @@
4957
}
5058

5159
.has-color-dark {
52-
background-color: #222222;
60+
background-color: #222;
5361

5462
h2,
5563
p {
56-
color: #F2F2F2;
64+
color: #f2f2f2;
5765
}
5866

5967
.wp-block-button__link {

blocks/image-content/src/style.scss

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@
66
*/
77

88
.wp-block-air-light-image-content {
9-
// TODO: Replace with includePaths in config
10-
11-
// Needed helpers
12-
// @import '../../../sass/helpers/font';
13-
// @import '../../../sass/helpers/variablefont';
14-
15-
// Variables
16-
@import '../../../sass/variables/breakpoints';
17-
@import '../../../sass/variables/colors';
18-
// @import '../../../sass/variables/typography';
19-
20-
// Needed elements
21-
// @import '../../../sass/layout/typography';
22-
@import '../../../sass/helpers/images';
23-
@import '../../../sass/helpers/animations';
24-
@import '../../../sass/components/button';
259

2610
// Get colors
2711
@include colors();
@@ -135,4 +119,20 @@
135119
order: 2;
136120
}
137121
}
122+
// TODO: Replace with includePaths in config
123+
124+
// Needed helpers
125+
// @use '../../../sass/helpers/font';
126+
// @use '../../../sass/helpers/variablefont';
127+
128+
// Variables
129+
@use '../../../sass/variables/breakpoints';
130+
@use '../../../sass/variables/colors';
131+
// @use '../../../sass/variables/typography';
132+
133+
// Needed elements
134+
// @use '../../../sass/layout/typography';
135+
@use '../../../sass/helpers/images';
136+
@use '../../../sass/helpers/animations';
137+
@use '../../../sass/components/button';
138138
}

functions.php

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -141,25 +141,26 @@
141141
// Accepts both string (all*/none-options only) and array (options + specific blocks)
142142
'allowed_blocks' => [
143143
'post' => [
144-
'core/column',
145-
'core/columns',
146-
'core/coverImage',
147-
'core/embed',
148-
'core/freeform',
149-
'core/gallery',
150-
'core/heading',
151-
'core/html',
152-
'core/image',
153-
'core/list',
154-
'core/list-item',
155-
'core/paragraph',
156-
'core/quote',
157-
'core/block',
158-
'core/table',
159-
'core/textColumns',
144+
// 'core/column',
145+
// 'core/columns',
146+
// 'core/coverImage',
147+
// 'core/embed',
148+
// 'core/freeform',
149+
// 'core/gallery',
150+
// 'core/heading',
151+
// 'core/html',
152+
// 'core/image',
153+
// 'core/list',
154+
// 'core/list-item',
155+
// 'core/paragraph',
156+
// 'core/quote',
157+
// 'core/block',
158+
// 'core/table',
159+
// 'core/textColumns',
160160
],
161161
'page' => [
162-
'all-core-blocks',
162+
'air-light/cta',
163+
// 'all-core-blocks',
163164
],
164165
// 'page' => [
165166
// 'all-acf-blocks',

0 commit comments

Comments
 (0)