Skip to content

Commit 2003ae4

Browse files
committed
fix(sass): rename $background-color variable in our loops
We were overriding this variable so the user couldn’t reference what they set it to. Fixes #8475
1 parent 855f137 commit 2003ae4

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

src/components/button/button.ios.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,17 @@ $button-ios-round-border-radius: $button-round-border-radius
157157
// --------------------------------------------------
158158

159159
@mixin ios-button-default($color-name, $color-base, $color-contrast) {
160-
$background-color: $color-base;
161-
$background-color-activated: color-shade($background-color);
160+
$bg-color: $color-base;
161+
$bg-color-activated: color-shade($bg-color);
162162
$fg-color: $color-contrast;
163163

164164
.button-ios-#{$color-name} {
165165
color: $fg-color;
166-
background-color: $background-color;
166+
background-color: $bg-color;
167167
}
168168

169169
.button-ios-#{$color-name}.activated {
170-
background-color: $background-color-activated;
170+
background-color: $bg-color-activated;
171171
}
172172
}
173173

src/components/button/button.md.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,21 +204,21 @@ $button-md-round-border-radius: $button-round-border-radius !def
204204
// --------------------------------------------------
205205

206206
@mixin md-button-default($color-name, $color-base, $color-contrast) {
207-
$background-color: $color-base;
208-
$background-color-activated: color-shade($background-color);
207+
$bg-color: $color-base;
208+
$bg-color-activated: color-shade($bg-color);
209209
$fg-color: $color-contrast;
210210

211211
.button-md-#{$color-name} {
212212
color: $fg-color;
213-
background-color: $background-color;
213+
background-color: $bg-color;
214214
}
215215

216216
.button-md-#{$color-name}:hover:not(.disable-hover) {
217-
background-color: $background-color;
217+
background-color: $bg-color;
218218
}
219219

220220
.button-md-#{$color-name}.activated {
221-
background-color: $background-color-activated;
221+
background-color: $bg-color-activated;
222222
opacity: $button-md-opacity-activated;
223223
}
224224

src/components/fab/fab.ios.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ $fab-ios-in-list-background-color-activated: color-shade($fab-ios-in-list-backg
4545

4646
@each $color-name, $color-base, $color-contrast in get-colors($colors-ios) {
4747

48-
$background-color: $color-base;
49-
$background-color-activated: color-shade($background-color);
48+
$bg-color: $color-base;
49+
$bg-color-activated: color-shade($bg-color);
5050
$fg-color: $color-contrast;
5151

5252
.fab-ios.fab-ios-#{$color-name} {
5353
color: $fg-color;
54-
background-color: $background-color;
54+
background-color: $bg-color;
5555
}
5656

5757
.fab-ios.fab-ios-#{$color-name}.activated {
58-
background-color: $background-color-activated;
58+
background-color: $bg-color-activated;
5959
}
6060
}
6161

src/components/fab/fab.md.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ $fab-md-in-list-background-color-activated: color-shade($fab-md-in-list-backgrou
5959

6060
@each $color-name, $color-base, $color-contrast in get-colors($colors-md) {
6161

62-
$background-color: $color-base;
63-
$background-color-activated: color-shade($background-color);
62+
$bg-color: $color-base;
63+
$bg-color-activated: color-shade($bg-color);
6464
$fg-color: $color-contrast;
6565

6666
.fab-md.fab-md-#{$color-name} {
6767
color: $fg-color;
68-
background-color: $background-color;
68+
background-color: $bg-color;
6969
}
7070

7171
.fab-md.fab-md-#{$color-name}.activated {
72-
background-color: $background-color-activated;
72+
background-color: $bg-color-activated;
7373
}
7474
}
7575

src/components/fab/fab.wp.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ $fab-wp-in-list-background-color-activated: color-shade($fab-wp-in-list-backgrou
4646

4747
@each $color-name, $color-base, $color-contrast in get-colors($colors-wp) {
4848

49-
$background-color: $color-base;
50-
$background-color-activated: color-shade($background-color);
49+
$bg-color: $color-base;
50+
$bg-color-activated: color-shade($bg-color);
5151
$fg-color: $color-contrast;
5252

5353
.fab-wp.fab-wp-#{$color-name} {
5454
color: $fg-color;
55-
background-color: $background-color;
55+
background-color: $bg-color;
5656
}
5757

5858
.fab-wp.fab-wp-#{$color-name}.activated {
59-
background-color: $background-color-activated;
59+
background-color: $bg-color-activated;
6060
}
6161
}

0 commit comments

Comments
 (0)