Skip to content

Commit aba7a39

Browse files
committed
chore: fix stylelint warnings
1 parent bb72cea commit aba7a39

File tree

4 files changed

+11
-24
lines changed

4 files changed

+11
-24
lines changed

scss/_modal.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
// Footer (for actions)
125125
.modal-footer {
126126
display: flex;
127-
flex-wrap: wrap;
128127
flex-shrink: 0;
128+
flex-wrap: wrap;
129129
align-items: center; // vertically center
130130
justify-content: flex-end; // Right align buttons with flex property because text-align doesn't work on flex items
131131
padding: $modal-inner-padding - $modal-footer-margin-between * .5;

scss/_nav.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@
4949

5050
&:hover,
5151
&:focus {
52-
border-color: var(--#{$variable-prefix}nav-tabs-link-hover-border-color, $nav-tabs-link-hover-border-color);
53-
5452
// Prevents active .nav-link tab overlapping focus outline of previous/next .nav-link
5553
isolation: isolate;
54+
border-color: var(--#{$variable-prefix}nav-tabs-link-hover-border-color, $nav-tabs-link-hover-border-color);
5655
}
5756

5857
&.disabled {

scss/mixins/_reset-text.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
text-transform: none;
1212
letter-spacing: normal;
1313
word-break: normal;
14-
word-spacing: normal;
1514
white-space: normal;
15+
word-spacing: normal;
1616
line-break: auto;
1717
}

scss/mixins/_utilities.scss

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
$property-class: if(map-has-key($utility, class), map-get($utility, class), nth($properties, 1));
2121
$property-class: if($property-class == null, "", $property-class);
2222

23+
// Use custom CSS variable name if present, otherwise default to `class`
24+
$css-variable-name: if(map-has-key($utility, css-variable-name), map-get($utility, css-variable-name), map-get($utility, class));
25+
2326
// State params to generate pseudo-classes
2427
$state: if(map-has-key($utility, state), map-get($utility, state), ());
2528

@@ -28,16 +31,6 @@
2831
// Don't prefix if value key is null (eg. with shadow class)
2932
$property-class-modifier: if($key, if($property-class == "" and $infix == "", "", "-") + $key, "");
3033

31-
// Generate CSS Variable
32-
$generate-vars: if(map-has-key($utility, vars), map-get($utility, vars), false);
33-
$generate-only-vars: if(map-has-key($utility, only-vars), map-get($utility, only-vars), false);
34-
35-
// Generate RTL version
36-
$generate-rtl: if(map-has-key($utility, rtl), map-get($utility, rtl), false);
37-
38-
// Add theme prefix
39-
$theme-prefix: if(map-has-key($utility, theme-prefix), map-get($utility, theme-prefix), false);
40-
4134
@if map-get($utility, rfs) {
4235
// Inside the media query
4336
@if $is-rfs-media-query {
@@ -62,28 +55,23 @@
6255

6356
@if $is-css-var {
6457
.#{$property-class + $infix + $property-class-modifier} {
65-
--#{$variable-prefix}#{$property-class}: #{$value};
58+
--#{$variable-prefix}#{$css-variable-name}: #{$value};
6659
}
6760

6861
@each $pseudo in $state {
6962
.#{$property-class + $infix + $property-class-modifier}-#{$pseudo}:#{$pseudo} {
70-
--#{$variable-prefix}#{$property-class}: #{$value};
63+
--#{$variable-prefix}#{$css-variable-name}: #{$value};
7164
}
7265
}
7366
} @else {
7467
.#{$property-class + $infix + $property-class-modifier} {
7568
@each $property in $properties {
7669
@if $is-local-vars {
77-
@each $local-var, $value in $is-local-vars {
78-
--#{$variable-prefix}#{$local-var}: #{$value};
70+
@each $local-var, $variable in $is-local-vars {
71+
--#{$variable-prefix}#{$local-var}: #{$variable};
7972
}
8073
}
81-
@if $generate-rtl == true {
82-
@include ltr-rtl($property, $value, null, null, if($enable-important-utilities, !important, null));
83-
}
84-
@else {
85-
#{$property}: $value if($enable-important-utilities, !important, null);
86-
}
74+
#{$property}: $value if($enable-important-utilities, !important, null);
8775
}
8876
}
8977

0 commit comments

Comments
 (0)