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

chore(label): remove item styles and escapes

Browse Source 
references #14808
This commit is contained in:
Cam Wiegert
2018-09-17 10:17:28 -05:00
parent 389e9d1931
commit c7d4b022e3
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/components/item/item.md.scss
View File

@ -1,5 +1,6 @@
@import "./item";
@import "./item.md.vars";
@import "../label/label.md.vars";
// Material Design Item
// --------------------------------------------------
@ -166,3 +167,8 @@
:host(:not(.item-label)) ::slotted(ion-textarea) {
--padding-start: 0;
}
:host(.item-has-focus:not(.ion-color)) ::slotted(.label-stacked),
:host(.item-has-focus:not(.ion-color)) ::slotted(.label-floating) {
color: $label-md-text-color-focused;
}

15
core/src/components/label/label.md.scss
View File

@ -15,15 +15,6 @@
}
// Material Design Default Label Inside An Input/Select Item
// --------------------------------------------------
// TODO, takes high priority
:host-context(.item-interactive) {
--ion-color-base: #{$label-md-text-color};
}
// Material Design Stacked & Floating Labels
// --------------------------------------------------
@ -43,10 +34,6 @@
@include margin(null, null, 0, 0);
}
:host-context(.item-has-focus).label-stacked,
:host-context(.item-has-focus).label-floating {
color: $label-md-text-color-focused;
}
// MD Typography
// --------------------------------------------------
@ -90,7 +77,7 @@
}
::slotted(p) {
color: #{$item-md-paragraph-text-color};
color: $item-md-paragraph-text-color;
}
:host-context(.ion-color)::slotted(p) {

2
core/src/components/label/label.scss
View File

@ -23,7 +23,7 @@
}
:host(.ion-color) {
color: #{current-color(base)};
color: current-color(base) !important;
}
:host([text-wrap]) {