Skip to content

Commit 06f556a

Browse files
committed
fix spacing and borders, buttons and icons in frontend
1 parent 11aef9b commit 06f556a

File tree

4 files changed

+59
-44
lines changed

4 files changed

+59
-44
lines changed

src/plugins/global-settings/buttons-and-icons/index.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,18 @@ public function add_global_buttons_and_icons_styles( $current_css ) {
9999
return $current_css;
100100
}
101101

102+
if ( $generated_css !== '' ) {
103+
add_action( 'body_class', array( $this, 'add_body_class_buttons_and_icons' ) );
104+
}
105+
102106
$current_css .= $generated_css;
103107
return apply_filters( 'stackable_frontend_css' , $current_css );
104108
}
109+
110+
public function add_body_class_buttons_and_icons( $classes ) {
111+
$classes[] = 'stk-has-design-system-buttons-and-icons';
112+
return $classes;
113+
}
105114
}
106115

107116
new Stackable_Global_Buttons_And_Icons();

src/plugins/global-settings/spacing-and-borders/index.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,18 @@ public function add_global_spacing_and_borders_styles( $current_css ) {
100100
return $current_css;
101101
}
102102

103+
if ( $generated_css !== '' ) {
104+
add_action( 'body_class', array( $this, 'add_body_class_spacing_and_borders' ) );
105+
}
106+
103107
$current_css .= $generated_css;
104108
return apply_filters( 'stackable_frontend_css' , $current_css );
105109
}
110+
111+
public function add_body_class_spacing_and_borders( $classes ) {
112+
$classes[] = 'stk-has-design-system-spacing-and-borders';
113+
return $classes;
114+
}
106115
}
107116

108117
new Stackable_Global_Spacing_And_Borders();

src/styles/block-design-system-blocks.scss

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,8 @@ body:not(.wp-admin) .stk-block-columns:has(> .stk-block-content > .stk-block-col
167167
}
168168

169169
&.is-style-ghost .stk-button {
170-
&::before {
171-
border-width: cssvar(button-ghost-border-width);
172-
}
173170
&:hover::before {
174-
border-width: cssvar(button-ghost-border-width-hover);
171+
border-width: var(--stk-button-ghost-border-width-hover, cssvar(button-ghost-border-width));
175172
}
176173
}
177174
}
@@ -182,13 +179,13 @@ body:not(.wp-admin) .stk-block-columns:has(> .stk-block-content > .stk-block-col
182179

183180
:where(.stk-hover-parent:hover) .stk-block:is(.stk-block-button, .stk-block-icon-button, .stk-block-pagination) {
184181
&:not(.is-style-link, .is-style-ghost) .stk-button::before {
185-
border-width: cssvar(button-border-width-parent-hover);
186-
box-shadow: cssvar(button-box-shadow-parent-hover);
182+
border-width: var(--stk-button-border-width-parent-hover, cssvar(button-border-width));
183+
box-shadow: var(--stk-button-box-shadow-parent-hover, cssvar(button-box-shadow));
187184

188185
}
189186
&.is-style-ghost .stk-button::before {
190-
border-width: cssvar(button-ghost-border-width-parent-hover);
191-
box-shadow: cssvar(button-box-shadow-parent-hover);
187+
border-width: var(--stk-button-ghost-border-width-parent-hover, cssvar(button-ghost-border-width));
188+
box-shadow: var(--stk-button-box-shadow-parent-hover, cssvar(button-box-shadow));
192189
}
193190
}
194191

@@ -209,13 +206,13 @@ body:not(.wp-admin) .stk-block-columns:has(> .stk-block-content > .stk-block-col
209206
border-width: cssvar(container-border-width);
210207

211208
&:hover {
212-
border-width: cssvar(container-border-width-hover);
213-
box-shadow: cssvar(container-box-shadow-hover);
209+
border-width: var(--stk-container-border-width-hover, cssvar(container-border-width));
210+
box-shadow: var(--stk-container-box-shadow-hover, cssvar(container-box-shadow));
214211
}
215212
}
216213
:where(.stk-hover-parent:hover) .stk-container:not(.stk--no-background) {
217-
border-width: cssvar(container-border-width-parent-hover);
218-
box-shadow: cssvar(container-box-shadow-parent-hover);
214+
border-width: var(--stk-container-border-width-parent-hover, cssvar(container-border-width));
215+
box-shadow: var(--stk-container-box-shadow-parent-hover, cssvar(container-box-shadow));
219216
}
220217
// .stk-container-padding {
221218
// &:hover {
@@ -244,14 +241,14 @@ body:not(.wp-admin) .stk-block-columns:has(> .stk-block-content > .stk-block-col
244241
border-style: cssvar(block-background-border-style);
245242
border-width: cssvar(block-background-border-width);
246243
&:hover {
247-
border-width: cssvar(block-background-border-width-hover);
248-
box-shadow: cssvar(block-background-box-shadow-hover);
244+
border-width: var(--stk-block-background-border-width-hover, cssvar(block-background-border-width));
245+
box-shadow: var(--stk-block-background-box-shadow-hover, cssvar(block-background-box-shadow));
249246
}
250247
}
251248

252249
:where(.stk-hover-parent:hover) .stk-block.stk-block-background {
253-
border-width: cssvar(block-background-border-width-parent-hover);
254-
box-shadow: cssvar(block-background-box-shadow-parent-hover);
250+
border-width: var(--stk-block-background-border-width-parent-hover, cssvar(block-background-border-width));
251+
box-shadow: var(--stk-block-background-box-shadow-parent-hover, cssvar(block-background-box-shadow));
255252
// &:not(.stk--no-padding) {
256253
// padding: cssvar(block-background-padding-parent-hover);
257254
// }
@@ -262,15 +259,15 @@ body:not(.wp-admin) .stk-block-columns:has(> .stk-block-content > .stk-block-col
262259
.stk-img-wrapper {
263260
filter: drop-shadow(cssvar(image-drop-shadow));
264261
&:hover {
265-
filter: drop-shadow(cssvar(image-drop-shadow-hover));
262+
filter: drop-shadow(var(--stk-image-drop-shadow-hover, cssvar(image-drop-shadow)));
266263
}
267264

268265
img {
269266
border-radius: cssvar(image-border-radius);
270267
}
271268
}
272269
:where(.stk-hover-parent:hover) .stk-img-wrapper {
273-
filter: drop-shadow(cssvar(image-drop-shadow-parent-hover));
270+
filter: drop-shadow(var(--stk-image-drop-shadow-parent-hover, cssvar(image-drop-shadow)));
274271
}
275272

276273
// Icons

src/styles/editor-block-design-system.scss

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@
2424
// Buttons
2525
.stk--is-hovered.stk-block:is(.stk-block-button, .stk-block-icon-button, .stk-block-pagination) {
2626
&:not(.is-style-link, .is-style-ghost) .stk-button::before {
27-
border-width: cssvar(button-border-width-hover);
28-
box-shadow: cssvar(button-box-shadow-hover);
27+
border-width: var(--stk-button-border-width-hover, cssvar(button-border-width));
28+
box-shadow: var(--stk-button-box-shadow-hover, cssvar(button-box-shadow));
2929
}
3030
&.is-style-ghost .stk-button::before {
31-
border-width: cssvar(button-ghost-border-width-hover);
32-
box-shadow: cssvar(button-box-shadow-hover);
31+
border-width: var(--stk-button-ghost-border-width-hover, cssvar(button-ghost-border-width));
32+
box-shadow: var(--stk-button-box-shadow-hover, cssvar(button-box-shadow));
3333
}
3434
}
3535
.is-selected .stk--is-hovered :where(.stk-hover-parent [data-type^="stackable/"]) :is(.stk-block-button, .stk-block-icon-button, .stk-block-pagination) {
3636
&:not(.is-style-link, .is-style-ghost) .stk-button::before {
37-
border-width: cssvar(button-border-width-parent-hover);
38-
box-shadow: cssvar(button-box-shadow-parent-hover);
37+
border-width: var(--stk-button-border-width-parent-hover, cssvar(button-border-width));
38+
box-shadow: var(--stk-button-box-shadow-parent-hover, cssvar(button-box-shadow));
3939
}
4040
&.is-style-ghost .stk-button::before {
41-
border-width: cssvar(button-ghost-border-width-parent-hover);
42-
box-shadow: cssvar(button-box-shadow-parent-hover);
41+
border-width: var(--stk-button-ghost-border-width-parent-hover, cssvar(button-ghost-border-width));
42+
box-shadow: var(--stk-button-box-shadow-parent-hover, cssvar(button-box-shadow));
4343
}
4444
}
4545
// Containers
@@ -49,60 +49,60 @@
4949
}
5050

5151
:where(.stk-hover-parent:hover) [data-type^="stackable/"] .stk-container:not(.stk--no-background) {
52-
border-width: cssvar(container-border-width-parent-hover);
53-
box-shadow: cssvar(container-box-shadow-parent-hover);
52+
border-width: var(--stk-container-border-width-parent-hover, cssvar(container-border-width));
53+
box-shadow: var(--stk-container-box-shadow-parent-hover, cssvar(container-box-shadow));
5454
}
5555

5656
.is-selected .stk--is-hovered .stk-hover-parent [data-type^="stackable/"] .stk-container:not(.stk--no-padding),
5757
.is-selected .stk--is-hovered .stk-hover-parent [data-type^="stackable/"] .stk-container-padding {
58-
padding: cssvar(container-padding-parent-hover);
58+
padding: var(--stk-container-padding-parent-hover, cssvar(container-padding));
5959
}
6060

6161
.stk--is-hovered .stk-container:not(.stk--no-padding),
6262
.stk--is-hovered .stk-container-padding {
63-
padding: cssvar(container-padding-hover);
63+
padding: var(--stk-container-padding-hover, cssvar(container-padding));
6464
}
6565

6666
.is-selected .stk--is-hovered .stk-hover-parent [data-type^="stackable/"] .stk-container:not(.stk--no-background) {
67-
box-shadow: cssvar(container-box-shadow-parent-hover);
68-
border-width: cssvar(container-border-width-parent-hover);
67+
box-shadow: var(--stk-container-box-shadow-parent-hover, cssvar(container-box-shadow));
68+
border-width: var(--stk-container-border-width-parent-hover, cssvar(container-border-width));
6969
}
7070

7171
.stk--is-hovered .stk-container:not(.stk--no-background) {
72-
box-shadow: cssvar(container-box-shadow-hover);
73-
border-width: cssvar(container-border-width-hover);
72+
box-shadow: var(--stk-container-box-shadow-hover, cssvar(container-box-shadow));
73+
border-width: var(--stk-container-border-width-hover, cssvar(container-border-width));
7474
}
7575

7676
// Block Backgrounds
7777
[data-type^="stackable/"] .stk-block.stk-block-background {
7878
border-style: cssvar(block-background-border-style);
7979
border-width: cssvar(block-background-border-width);
8080
&:hover {
81-
border-width: cssvar(block-background-border-width-hover);
82-
box-shadow: cssvar(block-background-box-shadow-hover);
81+
border-width: var(--stk-block-background-border-width-hover, cssvar(block-background-border-width));
82+
box-shadow: var(--stk-block-background-box-shadow-hover, cssvar(block-background-box-shadow));
8383
}
8484
}
8585
.stk-hover-parent:hover .stk-block-background {
86-
border-width: cssvar(block-background-border-width-parent-hover);
87-
box-shadow: cssvar(block-background-box-shadow-parent-hover);
86+
border-width: var(--stk-block-background-border-width-parent-hover, cssvar(block-background-border-width));
87+
box-shadow: var(--stk-block-background-box-shadow-parent-hover, cssvar(block-background-box-shadow));
8888
}
8989

9090
.is-selected .stk--is-hovered .stk-hover-parent [data-type^="stackable/"] .stk-block-background {
91-
border-width: cssvar(block-background-border-width-parent-hover);
92-
box-shadow: cssvar(block-background-box-shadow-parent-hover);
91+
border-width: var(--stk-block-background-border-width-parent-hover, cssvar(block-background-border-width));
92+
box-shadow: var(--stk-block-background-box-shadow-parent-hover, cssvar(block-background-box-shadow));
9393
}
9494

9595
[data-type^="stackable/"] .stk--is-hovered.stk-block-background {
96-
border-width: cssvar(block-background-border-width-hover);
97-
box-shadow: cssvar(block-background-box-shadow-hover);
96+
border-width: var(--stk-block-background-border-width-hover, cssvar(block-background-border-width));
97+
box-shadow: var(--stk-block-background-box-shadow-hover, cssvar(block-background-box-shadow));
9898
}
9999

100100
// Images
101101
.stk--is-hovered .stk-img-wrapper {
102-
filter: drop-shadow(cssvar(image-drop-shadow-hover));
102+
filter: drop-shadow(var(--stk-image-drop-shadow-hover, cssvar(image-drop-shadow)));
103103
}
104104
.is-selected .stk--is-hovered .stk-hover-parent .stk-img-wrapper {
105-
filter: drop-shadow(cssvar(image-drop-shadow-parent-hover));
105+
filter: drop-shadow(var(--stk-image-drop-shadow-parent-hover, cssvar(image-drop-shadow)));
106106
}
107107
}
108108

0 commit comments

Comments
 (0)