javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(list): moved ion-list-header and ion-item-divider outside of the ion-list selector

Browse Source 
closes #651
This commit is contained in:
Brandy Carney
2015-12-01 11:02:15 -05:00
parent 3f3b0669eb
commit 1107f69685
3 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ionic/components/list/list.scss
View File

@@ -3,19 +3,18 @@
// List
// --------------------------------------------------
ion-list-header {
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
ion-list {
display: block;
margin: 0;
padding: 0;
list-style-type: none;
ion-list-header {
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
ion-list[inset] {

56
ionic/components/list/modes/ios.scss
View File

@@ -27,20 +27,20 @@ $list-ios-border-color: $list-border-color !default;
/* DEFAULT LIST */
/****************/
ion-list-header {
position: relative;
padding: $list-ios-header-padding;
font-size: $list-ios-header-font-size;
font-weight: $list-ios-header-font-weight;
letter-spacing: $list-ios-header-letter-spacing;
text-transform: uppercase;
color: $list-ios-header-color;
border-bottom: 1px solid $list-ios-border-color;
}
ion-list {
margin: -1px $list-ios-margin-right $list-ios-margin-bottom $list-ios-margin-left;
ion-list-header {
position: relative;
padding: $list-ios-header-padding;
font-size: $list-ios-header-font-size;
font-weight: $list-ios-header-font-weight;
letter-spacing: $list-ios-header-letter-spacing;
text-transform: uppercase;
color: $list-ios-header-color;
border-bottom: 1px solid $list-ios-border-color;
}
> .item:first-child {
border-top: 1px solid $list-ios-border-color;
}
@@ -96,30 +96,34 @@ ion-list + ion-list {
}
}
&.hairlines ion-list {
ion-item-options {
border-width: 0.55px;
}
&.hairlines {
ion-list-header {
border-bottom-width: 0.55px;
}
.item {
.item-inner {
ion-list {
ion-item-options {
border-width: 0.55px;
}
.item {
.item-inner {
border-width: 0.55px;
}
}
> .item:first-child {
border-top-width: 0.55px;
}
> .item:last-child,
> ion-item-sliding:last-child .item {
border-bottom-width: 0.55px;
}
}
> .item:first-child {
border-top-width: 0.55px;
}
> .item:last-child,
> ion-item-sliding:last-child .item {
border-bottom-width: 0.55px;
}
}

18
ionic/components/list/modes/md.scss
View File

@@ -25,18 +25,18 @@ $list-md-border-color: $item-md-border-color !default;
/* DEFAULT LIST */
/****************/
ion-list-header,
ion-item-divider {
border-bottom: 1px solid $list-md-border-color;
margin-left: 0;
padding: $list-md-header-padding;
font-size: $list-md-header-font-size;
color: $list-md-header-color;
}
ion-list {
margin: 0 $list-md-margin-right $list-md-margin-bottom $list-md-margin-left;
ion-list-header,
ion-item-divider {
border-bottom: 1px solid $list-md-border-color;
margin-left: 0;
padding: $list-md-header-padding;
font-size: $list-md-header-font-size;
color: $list-md-header-color;
}
.item-inner {
border-bottom: 1px solid $list-md-border-color;
}