javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(sass): renaming Sass variables in each loops to be consistent

Browse Source 
closes #603
This commit is contained in:
Brandy Carney
2015-11-20 13:25:04 -05:00
parent fca5f9bbba
commit c2b7a0c75d
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/app/typography.scss
View File

@ -101,7 +101,7 @@ sub {
bottom: -0.25em;
}
@each $color, $value in $colors {
@each $color-name, $color-value in $colors {
h1, h2, h3, h4, h5, h6,
p,
span,
@ -114,8 +114,8 @@ sub {
em,
sub,
sup {
&[#{$color}] {
color: $value !important;
&[#{$color-name}] {
color: $color-value !important;
}
}
}

8
ionic/components/button/button-outline.scss
View File

@ -42,12 +42,12 @@ button,
// Outline Clear Button Colors
// --------------------------------------------------
@each $color, $value in auxiliary-colors() {
@each $color-name, $color-value in auxiliary-colors() {
button[#{$color}],
[button][#{$color}] {
button[#{$color-name}],
[button][#{$color-name}] {
$fg-color: darken-or-lighten($value, 5%);
$fg-color: darken-or-lighten($color-value, 5%);
@include button-outline($fg-color);
}

8
ionic/components/button/button.scss
View File

@ -142,12 +142,12 @@ a[button] {
// Generate Default Button Colors
// --------------------------------------------------
@each $color, $value in $colors {
@each $color-name, $color-value in $colors {
button[#{$color}],
[button][#{$color}] {
button[#{$color-name}],
[button][#{$color-name}] {
$bg-color: $value;
$bg-color: $color-value;
$bg-color-activated: darken-or-lighten($bg-color);
$text-color: inverse($bg-color);
@include button-default($bg-color, $bg-color-activated, $text-color);

7
ionic/components/searchbar/modes/ios.scss
View File

@ -129,12 +129,13 @@ ion-searchbar.left-align {
// Generate Default Search Bar Colors
// --------------------------------------------------
@each $color, $value in $colors {
@each $color-name, $color-value in $colors {
ion-searchbar[#{$color}] {
ion-searchbar[#{$color-name}] {
.searchbar-cancel {
color: $value;
color: $color-value;
}
}
}