Skip to content

Commit

Permalink
fix(sass): rename $background-color variable in our loops
Browse files Browse the repository at this point in the history
We were overriding this variable so the user couldn’t reference what
they set it to.

Fixes #8475
  • Loading branch information
brandyscarney committed Oct 28, 2016
1 parent 855f137 commit 2003ae4
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions src/components/button/button.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,17 @@ $button-ios-round-border-radius: $button-round-border-radius
// --------------------------------------------------

@mixin ios-button-default($color-name, $color-base, $color-contrast) {
$background-color: $color-base;
$background-color-activated: color-shade($background-color);
$bg-color: $color-base;
$bg-color-activated: color-shade($bg-color);
$fg-color: $color-contrast;

.button-ios-#{$color-name} {
color: $fg-color;
background-color: $background-color;
background-color: $bg-color;
}

.button-ios-#{$color-name}.activated {
background-color: $background-color-activated;
background-color: $bg-color-activated;
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/components/button/button.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -204,21 +204,21 @@ $button-md-round-border-radius: $button-round-border-radius !def
// --------------------------------------------------

@mixin md-button-default($color-name, $color-base, $color-contrast) {
$background-color: $color-base;
$background-color-activated: color-shade($background-color);
$bg-color: $color-base;
$bg-color-activated: color-shade($bg-color);
$fg-color: $color-contrast;

.button-md-#{$color-name} {
color: $fg-color;
background-color: $background-color;
background-color: $bg-color;
}

.button-md-#{$color-name}:hover:not(.disable-hover) {
background-color: $background-color;
background-color: $bg-color;
}

.button-md-#{$color-name}.activated {
background-color: $background-color-activated;
background-color: $bg-color-activated;
opacity: $button-md-opacity-activated;
}

Expand Down
8 changes: 4 additions & 4 deletions src/components/fab/fab.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ $fab-ios-in-list-background-color-activated: color-shade($fab-ios-in-list-backg

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

$background-color: $color-base;
$background-color-activated: color-shade($background-color);
$bg-color: $color-base;
$bg-color-activated: color-shade($bg-color);
$fg-color: $color-contrast;

.fab-ios.fab-ios-#{$color-name} {
color: $fg-color;
background-color: $background-color;
background-color: $bg-color;
}

.fab-ios.fab-ios-#{$color-name}.activated {
background-color: $background-color-activated;
background-color: $bg-color-activated;
}
}

8 changes: 4 additions & 4 deletions src/components/fab/fab.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@ $fab-md-in-list-background-color-activated: color-shade($fab-md-in-list-backgrou

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

$background-color: $color-base;
$background-color-activated: color-shade($background-color);
$bg-color: $color-base;
$bg-color-activated: color-shade($bg-color);
$fg-color: $color-contrast;

.fab-md.fab-md-#{$color-name} {
color: $fg-color;
background-color: $background-color;
background-color: $bg-color;
}

.fab-md.fab-md-#{$color-name}.activated {
background-color: $background-color-activated;
background-color: $bg-color-activated;
}
}

8 changes: 4 additions & 4 deletions src/components/fab/fab.wp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ $fab-wp-in-list-background-color-activated: color-shade($fab-wp-in-list-backgrou

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

$background-color: $color-base;
$background-color-activated: color-shade($background-color);
$bg-color: $color-base;
$bg-color-activated: color-shade($bg-color);
$fg-color: $color-contrast;

.fab-wp.fab-wp-#{$color-name} {
color: $fg-color;
background-color: $background-color;
background-color: $bg-color;
}

.fab-wp.fab-wp-#{$color-name}.activated {
background-color: $background-color-activated;
background-color: $bg-color-activated;
}
}

0 comments on commit 2003ae4

Please sign in to comment.