Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(label): move default flex and margin to item #16461

Merged
merged 8 commits into from
Nov 27, 2018
8 changes: 8 additions & 0 deletions core/src/components/item-divider/item-divider.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@
}


// Material Design Slotted Label
// --------------------------------------------------

::slotted(ion-label) {
@include margin(10px, 8px, 10px, 0);
}


// iOS Item Divider Content
// --------------------------------------------------

Expand Down
8 changes: 8 additions & 0 deletions core/src/components/item-divider/item-divider.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@
}


// Material Design Slotted Label
// --------------------------------------------------

::slotted(ion-label) {
@include margin(13px, 0, 10px, 0);
}


// Material Design Slotted Icon
// --------------------------------------------------

Expand Down
8 changes: 8 additions & 0 deletions core/src/components/item/item.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,14 @@
}


// iOS Slotted Label
// --------------------------------------------------

::slotted(ion-label) {
@include margin(10px, 8px, 10px, 0);
}


// iOS Stacked & Floating Inputs
// --------------------------------------------------

Expand Down
9 changes: 9 additions & 0 deletions core/src/components/item/item.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,15 @@
}


// Material Design Slotted Label
// --------------------------------------------------

::slotted(ion-label) {
@include margin(13px, 0, 10px, 0);
}



// Material Design Floating/Stacked Label
// --------------------------------------------------

Expand Down
4 changes: 4 additions & 0 deletions core/src/components/item/item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ button, a {
z-index: 1;
}

::slotted(ion-label) {
flex: 1;
}


// Item Input
// -----------------------------------------
Expand Down
4 changes: 0 additions & 4 deletions core/src/components/label/label.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
// iOS Label
// --------------------------------------------------

:host-context(.item) {
@include margin($label-ios-margin-top, $label-ios-margin-end, $label-ios-margin-bottom, $label-ios-margin-start);
}

:host([text-wrap]) {
font-size: $label-ios-text-wrap-font-size;

Expand Down
4 changes: 0 additions & 4 deletions core/src/components/label/label.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
// Material Design Label
// --------------------------------------------------

:host-context(.item) {
@include margin($label-md-margin-top, $label-md-margin-end, $label-md-margin-bottom, $label-md-margin-start);
}

:host([text-wrap]) {
line-height: $label-md-text-wrap-line-height;
}
Expand Down
4 changes: 0 additions & 4 deletions core/src/components/label/label.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@
*/
--color: initial;

@include margin(0);

display: block;

flex: 1;

color: var(--color);

font-family: $font-family-base;
Expand Down