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(label): add the $label-ios-text-color sass variables back

Browse Source 
adds better descriptions for the sass variables in the other modes

resolves #11373
This commit is contained in:
Brandy Carney
2017-04-28 18:18:57 -04:00
parent 20b7ab7c57
commit 588fad879f
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/label/label.ios.scss
View File

@ -3,8 +3,14 @@
// iOS Label
// --------------------------------------------------
/// @prop - Text color of the label by an input, select, or datetime
$label-ios-text-color: unset !default;
/// @prop - Text color of the stacked/floating label when it is focused
$label-ios-text-color-focused: unset !default;
/// @prop - Margin of the label
$label-ios-margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0 !default;
$label-ios-margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0 !default;
// iOS Default Label
@ -18,6 +24,16 @@ $label-ios-margin: $item-ios-padding-top ($item-ios-padding-right /
// iOS Default Label Inside An Input/Select Item
// --------------------------------------------------
.item-input .label-ios,
.item-select .label-ios,
.item-datetime .label-ios {
color: $label-ios-text-color;
}
// iOS Input By Label
// --------------------------------------------------
.label-ios + ion-input .text-input,
.label-ios + ion-textarea .text-input,
.label-ios + .input + .cloned-input {
@ -59,6 +75,11 @@ $label-ios-margin: $item-ios-padding-top ($item-ios-padding-right /
margin-bottom: $item-ios-padding-media-bottom - 2;
}
.input-has-focus .label-ios[stacked],
.input-has-focus .label-ios[floating] {
color: $label-ios-text-color-focused;
}
// Generate iOS Label colors
// --------------------------------------------------

4
src/components/label/label.md.scss
View File

@ -3,10 +3,10 @@
// Material Design Label
// --------------------------------------------------
/// @prop - Text color of the label
/// @prop - Text color of the label by an input, select, or datetime
$label-md-text-color: #999 !default;
/// @prop - Text color of the label when it has focused
/// @prop - Text color of the stacked/floating label when it is focused
$label-md-text-color-focused: color($colors-md, primary) !default;
/// @prop - Margin of the label

4
src/components/label/label.wp.scss
View File

@ -3,10 +3,10 @@
// Windows Label
// --------------------------------------------------
/// @prop - Text color of the label
/// @prop - Text color of the label by an input, select, or datetime
$label-wp-text-color: #999 !default;
/// @prop - Text color of the label when it has focused
/// @prop - Text color of the stacked/floating label when it is focused
$label-wp-text-color-focused: color($colors-wp, primary) !default;