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

feat(text-input): adding color attributes for the ion-label

Browse Source 
closes #585
This commit is contained in:
Brandy Carney
2015-11-20 14:22:45 -05:00
parent 19ff9e0a2c
commit f966555034
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/text-input/test/floating-labels/main.html
View File

@ -22,17 +22,17 @@
</ion-input> </ion-input>
<ion-input floating-label> <ion-input floating-label>
<ion-label>Floating Label 4</ion-label> <ion-label primary>Floating Label 4</ion-label>
<textarea></textarea> <textarea></textarea>
</ion-input> </ion-input>
<ion-input floating-label> <ion-input floating-label>
<ion-label>Floating Label 5</ion-label> <ion-label secondary>Floating Label 5</ion-label>
<input type="url"> <input type="url">
</ion-input> </ion-input>
<ion-input floating-label> <ion-input floating-label>
<ion-label>Floating Label 6</ion-label> <ion-label danger>Floating Label 6</ion-label>
<input type="email"> <input type="email">
</ion-input> </ion-input>

8
ionic/components/text-input/text-input.scss
View File

@ -70,3 +70,11 @@ input,
textarea { textarea {
@include placeholder(); @include placeholder();
} }
@each $color-name, $color-value in $colors {
ion-label {
&[#{$color-name}] {
color: $color-value !important;
}
}
}