javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-21 04:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(label): move label css to the correct scss files

Browse Source 
references #5651
This commit is contained in:
Brandy Carney
2016-02-29 12:24:40 -05:00
parent 0480fa3b50
commit 4c93eb06a9
6 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ionic/components/card/test/list/main.html
View File

@ -11,27 +11,20 @@
Card List Card List
</ion-list-header> </ion-list-header>
<ion-item> <button ion-item>
<ion-icon name="wifi" item-left></ion-icon> <ion-icon name="cart" item-left></ion-icon>
<ion-label>Wifi</ion-label> Shopping
<ion-toggle></ion-toggle> </button>
</ion-item>
<ion-item> <button ion-item>
<ion-icon name="heart" item-left></ion-icon> <ion-icon name="medical" item-left></ion-icon>
Affection Hospital
<ion-note item-right> </button>
Very Little
</ion-note>
</ion-item>
<ion-item> <button ion-item>
<ion-icon name="home" item-left></ion-icon> <ion-icon name="paw" item-left></ion-icon>
Home Dog Park
<ion-note item-right> </button>
Where the heart is
</ion-note>
</ion-item>
</ion-list> </ion-list>

5
ionic/components/item/item.md.scss
View File

@ -103,11 +103,6 @@ ion-icon[item-right] {
padding: 0 1px; padding: 0 1px;
} }
[text-wrap] ion-label {
font-size: $item-md-body-text-font-size;
line-height: $item-md-body-text-line-height;
}
ion-icon[item-left] + .item-inner, ion-icon[item-left] + .item-inner,
ion-icon[item-left] + .item-input { ion-icon[item-left] + .item-input {
margin-left: $item-md-padding-left + ($item-md-padding-left / 2); margin-left: $item-md-padding-left + ($item-md-padding-left / 2);

12
ionic/components/item/item.scss
View File

@ -61,18 +61,6 @@ ion-item-divider {
} }
} }
ion-label {
margin: 0;
flex: 1;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
[text-wrap] ion-label {
white-space: normal;
}
[vertical-align-top], [vertical-align-top],
ion-input.item { ion-input.item {
align-items: flex-start; align-items: flex-start;

3
ionic/components/label/label.ios.scss
View File

@ -5,13 +5,14 @@
// -------------------------------------------------- // --------------------------------------------------
$label-ios-text-color: #7f7f7f !default; $label-ios-text-color: #7f7f7f !default;
$label-ios-margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0 !default;
// iOS Default Label // iOS Default Label
// -------------------------------------------------- // --------------------------------------------------
ion-label { ion-label {
margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0; margin: $label-ios-margin;
} }

7
ionic/components/label/label.md.scss
View File

@ -6,15 +6,20 @@
$label-md-text-color: #999 !default; $label-md-text-color: #999 !default;
$label-md-text-color-focused: map-get($colors-md, primary) !default; $label-md-text-color-focused: map-get($colors-md, primary) !default;
$label-md-margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom 0 !default;
// Material Design Default Label // Material Design Default Label
// -------------------------------------------------- // --------------------------------------------------
ion-label { ion-label {
margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom 0; margin: $label-md-margin;
} }
[text-wrap] ion-label {
font-size: $item-md-body-text-font-size;
line-height: $item-md-body-text-line-height;
}
// Material Design Default Label Inside An Input Item // Material Design Default Label Inside An Input Item
// -------------------------------------------------- // --------------------------------------------------

9
ionic/components/label/label.scss
View File

@ -7,15 +7,22 @@ ion-label {
display: block; display: block;
font-size: inherit; font-size: inherit;
white-space: nowrap; white-space: nowrap;
margin: 0;
flex: 1;
text-overflow: ellipsis;
overflow: hidden;
} }
.item-input ion-label { .item-input ion-label {
max-width: 200px; max-width: 200px;
flex: initial; flex: initial;
pointer-events: none; pointer-events: none;
} }
[text-wrap] ion-label {
white-space: normal;
}
// Stacked & Floating Inputs // Stacked & Floating Inputs
// -------------------------------------------------- // --------------------------------------------------