Skip to content

Commit 2c0ee7f

Browse files
committed
chore: prepare upcomming sass behavior change
1 parent 1f8d833 commit 2c0ee7f

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

src/assets/scss/components/_button.scss

+11-10
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,13 @@ $button-outlined-background-color: transparent !default;
6060
height: var(--#{$prefix}button-height, $button-height);
6161

6262
&__wrapper {
63-
@include side-flex-gap($button-margin-icon-to-text);
6463
display: inline-flex;
6564
align-items: center;
6665
justify-content: center;
6766
position: relative;
6867
width: 100%;
68+
69+
@include side-flex-gap($button-margin-icon-to-text);
6970
}
7071

7172
&__label {
@@ -89,14 +90,14 @@ $button-outlined-background-color: transparent !default;
8990
pointer-events: none;
9091
}
9192

92-
// size variants
93+
/* size variants*/
9394
@each $name, $value in $sizes {
9495
&--#{$name} {
9596
font-size: var(--#{$prefix}button-font-size-#{$name}, $value);
9697
}
9798
}
9899

99-
// color variants
100+
/* color variants*/
100101
@each $name, $pair in $colors {
101102
$color: list.nth($pair, 1);
102103
$color-invert: list.nth($pair, 2);
@@ -109,8 +110,8 @@ $button-outlined-background-color: transparent !default;
109110
color: var(--#{$prefix}variant-invert-#{$name}, $color-invert);
110111

111112
&:hover {
112-
// background-color: darken($color, 2.5%)
113-
// IE 11 needs polyfill
113+
/* background-color: darken($color, 2.5%)*/
114+
/* IE 11 needs polyfill*/
114115
filter: brightness(97.5%);
115116
}
116117
}
@@ -187,8 +188,8 @@ $button-outlined-background-color: transparent !default;
187188
color: var(--#{$prefix}button-background-color, $button-background-color);
188189

189190
&:hover {
190-
// background-color: darken($color-invert, 5%)
191-
// IE 11 needs polyfill
191+
/* background-color: darken($color-invert, 5%)*/
192+
/* IE 11 needs polyfill*/
192193
filter: brightness(95%);
193194
}
194195

@@ -208,15 +209,15 @@ $button-outlined-background-color: transparent !default;
208209

209210
&:focus,
210211
&:hover {
211-
// background-color: darken($color-invert, 5%)
212-
// IE 11 needs polyfill
212+
/* background-color: darken($color-invert, 5%)*/
213+
/* IE 11 needs polyfill*/
213214
filter: brightness(95%);
214215
}
215216
}
216217
}
217218
}
218219

219-
// focus effect
220+
/* focus effect*/
220221
&:focus,
221222
&:focus-within {
222223
box-shadow: 0 0 0 0.25rem var(--#{$prefix}focus);

src/assets/scss/components/_skeleton.scss

+8-8
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ $skeleton-margin: 0.5rem 0 0 0 !default;
3939
background: var(--#{$prefix}skeleton-background, $skeleton-background);
4040
margin: var(--#{$prefix}skeleton-margin, $skeleton-margin);
4141

42+
@include steps-size($base-font-size);
43+
44+
@each $name, $value in $sizes {
45+
&--#{$name} {
46+
@include steps-size($value, $name);
47+
}
48+
}
49+
4250
&--rounded {
4351
border-radius: var(
4452
--#{$prefix}skeleton-border-radius,
@@ -59,14 +67,6 @@ $skeleton-margin: 0.5rem 0 0 0 !default;
5967
&::after {
6068
content: "\00a0";
6169
}
62-
63-
@include steps-size($base-font-size);
64-
65-
@each $name, $value in $sizes {
66-
&--#{$name} {
67-
@include steps-size($value, $name);
68-
}
69-
}
7070
}
7171

7272
&--centered {

0 commit comments

Comments
 (0)