diff --git a/ionic/components/list/list.scss b/ionic/components/list/list.scss index bb4b6ab234..53b922e553 100644 --- a/ionic/components/list/list.scss +++ b/ionic/components/list/list.scss @@ -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] { diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss index d0ffcc3349..3a00901946 100644 --- a/ionic/components/list/modes/ios.scss +++ b/ionic/components/list/modes/ios.scss @@ -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; - } } diff --git a/ionic/components/list/modes/md.scss b/ionic/components/list/modes/md.scss index b9dd55e3b1..2ee89a3e46 100644 --- a/ionic/components/list/modes/md.scss +++ b/ionic/components/list/modes/md.scss @@ -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; }