Skip to content

Commit 588fad8

Browse files
committed
fix(label): add the $label-ios-text-color sass variables back
adds better descriptions for the sass variables in the other modes resolves #11373
1 parent 20b7ab7 commit 588fad8

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

src/components/label/label.ios.scss

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
// iOS Label
44
// --------------------------------------------------
55

6+
/// @prop - Text color of the label by an input, select, or datetime
7+
$label-ios-text-color: unset !default;
8+
9+
/// @prop - Text color of the stacked/floating label when it is focused
10+
$label-ios-text-color-focused: unset !default;
11+
612
/// @prop - Margin of the label
7-
$label-ios-margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0 !default;
13+
$label-ios-margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0 !default;
814

915

1016
// iOS Default Label
@@ -18,6 +24,16 @@ $label-ios-margin: $item-ios-padding-top ($item-ios-padding-right /
1824
// iOS Default Label Inside An Input/Select Item
1925
// --------------------------------------------------
2026

27+
.item-input .label-ios,
28+
.item-select .label-ios,
29+
.item-datetime .label-ios {
30+
color: $label-ios-text-color;
31+
}
32+
33+
34+
// iOS Input By Label
35+
// --------------------------------------------------
36+
2137
.label-ios + ion-input .text-input,
2238
.label-ios + ion-textarea .text-input,
2339
.label-ios + .input + .cloned-input {
@@ -59,6 +75,11 @@ $label-ios-margin: $item-ios-padding-top ($item-ios-padding-right /
5975
margin-bottom: $item-ios-padding-media-bottom - 2;
6076
}
6177

78+
.input-has-focus .label-ios[stacked],
79+
.input-has-focus .label-ios[floating] {
80+
color: $label-ios-text-color-focused;
81+
}
82+
6283

6384
// Generate iOS Label colors
6485
// --------------------------------------------------

src/components/label/label.md.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// Material Design Label
44
// --------------------------------------------------
55

6-
/// @prop - Text color of the label
6+
/// @prop - Text color of the label by an input, select, or datetime
77
$label-md-text-color: #999 !default;
88

9-
/// @prop - Text color of the label when it has focused
9+
/// @prop - Text color of the stacked/floating label when it is focused
1010
$label-md-text-color-focused: color($colors-md, primary) !default;
1111

1212
/// @prop - Margin of the label

src/components/label/label.wp.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// Windows Label
44
// --------------------------------------------------
55

6-
/// @prop - Text color of the label
6+
/// @prop - Text color of the label by an input, select, or datetime
77
$label-wp-text-color: #999 !default;
88

9-
/// @prop - Text color of the label when it has focused
9+
/// @prop - Text color of the stacked/floating label when it is focused
1010
$label-wp-text-color-focused: color($colors-wp, primary) !default;
1111

1212

0 commit comments

Comments
 (0)