javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(sass): rename $background-color variable in our loops

Browse Source 
We were overriding this variable so the user couldn’t reference what
they set it to.

Fixes #8475
This commit is contained in:
Brandy Carney
2016-10-28 13:28:15 -04:00
parent 855f137097
commit 2003ae48d5
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/button/button.ios.scss
View File

@ -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;
}
}

10
src/components/button/button.md.scss
View File

@ -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;
}

8
src/components/fab/fab.ios.scss
View File

@ -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
src/components/fab/fab.md.scss
View File

@ -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
src/components/fab/fab.wp.scss
View File

@ -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;
}
}