javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(text-input): renamed Sass variables to keep consistent

Browse Source 
references #678
This commit is contained in:
Brandy Carney
2015-12-03 10:49:36 -05:00
parent e572f04242
commit 71235928ba
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/text-input/modes/ios.scss
View File

@@ -3,7 +3,7 @@
// iOS Text Input
// --------------------------------------------------
$input-label-ios-color: #7f7f7f !default;
$text-input-ios-label-color: #7f7f7f !default;
[text-input] {
@@ -18,7 +18,7 @@ ion-input[inset] [text-input] {
ion-label {
margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
color: $input-label-ios-color;
color: $text-input-ios-label-color;
}
ion-label + [text-input] {

19
ionic/components/text-input/modes/md.scss
View File

@@ -3,11 +3,10 @@
// Material Design Text Input
// --------------------------------------------------
$text-input-highlight-color: color(primary) !default;
$text-input-label-md-color: #999 !default;
$text-input-hightlight-color-valid: color(secondary) !default;
$text-input-hightlight-color-invalid: color(danger) !default;
$text-input-md-label-color: #999 !default;
$text-input-md-highlight-color: color(primary) !default;
$text-input-md-hightlight-color-valid: color(secondary) !default;
$text-input-md-hightlight-color-invalid: color(danger) !default;
[text-input] {
@@ -22,7 +21,7 @@ ion-input[inset] [text-input] {
ion-label {
margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom ($item-md-padding-left / 2);
color: $text-input-label-md-color;
color: $text-input-md-label-color;
}
ion-input:after {
@@ -35,15 +34,15 @@ ion-input:after {
}
ion-input.has-focus:after {
border-bottom: 2px solid $text-input-highlight-color;
border-bottom: 2px solid $text-input-md-highlight-color;
}
ion-input.ng-valid.has-value:after {
border-bottom: 2px solid $text-input-hightlight-color-valid;
border-bottom: 2px solid $text-input-md-hightlight-color-valid;
}
ion-input.ng-invalid.ng-touched:after {
border-bottom: 2px solid $text-input-hightlight-color-invalid;
border-bottom: 2px solid $text-input-md-hightlight-color-invalid;
}
[stacked-label] ion-label {
@@ -58,7 +57,7 @@ ion-input.ng-invalid.ng-touched:after {
[stacked-label].has-focus ion-label,
[floating-label].has-focus ion-label {
color: $text-input-highlight-color;
color: $text-input-md-highlight-color;
}
[stacked-label] [text-input],