From 8c2a7a8932309209af657d84b6b0c33b91cc4f65 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 4 Sep 2015 09:40:54 -0500 Subject: [PATCH] use .list not ion-list css --- ionic/components/app/test/music/main.html | 4 ++-- ionic/components/item/item.scss | 4 ++-- ionic/components/item/modes/ios.scss | 4 ++-- ionic/components/item/modes/material.scss | 2 +- ionic/components/list/list.scss | 4 ++-- ionic/components/list/modes/ios.scss | 10 +++++----- ionic/components/list/modes/material.scss | 10 +++++----- ionic/components/text-input/modes/ios.scss | 2 +- ionic/components/text-input/modes/material.scss | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ionic/components/app/test/music/main.html b/ionic/components/app/test/music/main.html index 62e1c37b0d..f922c4b94c 100644 --- a/ionic/components/app/test/music/main.html +++ b/ionic/components/app/test/music/main.html @@ -36,11 +36,11 @@ background: url('http://ionic-io-assets.s3.amazonaws.com/menu.jpg'); background-size: cover; } - .mode-ios ion-list .item { + .mode-ios .list .item { background: transparent; min-height: 55px; } - .mode-ios ion-list .item ion-item-content { + .mode-ios .list .item ion-item-content { background: transparent; color: rgba(255,255,255,0.8); padding: 10px; diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss index 77784abc96..f26ed02a6e 100644 --- a/ionic/components/item/item.scss +++ b/ionic/components/item/item.scss @@ -55,11 +55,11 @@ ion-item-content { text-align: center; } -ion-list .item > icon[small]:first-child { +.list .item > icon[small]:first-child { min-width: 18px; } -ion-list .item { +.list .item { border-radius: 0; transition: background 300ms ease-out; diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss index 4093a919f1..4b84dfa59a 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -23,7 +23,7 @@ $item-ios-note-color: darken($item-ios-border-color, 10%) !default; $item-ios-forward-icon-color: $item-ios-border-color !default; -ion-list[mode=ios] { +.list[mode=ios] { .item { margin-top: -1px; @@ -141,7 +141,7 @@ ion-list[mode=ios] { } -.hairlines ion-list[mode=ios] .item { +.hairlines .list[mode=ios] .item { margin-top: -0.5px; &:last-child { diff --git a/ionic/components/item/modes/material.scss b/ionic/components/item/modes/material.scss index b83b6a551f..a652673c72 100644 --- a/ionic/components/item/modes/material.scss +++ b/ionic/components/item/modes/material.scss @@ -26,7 +26,7 @@ $item-md-note-color: darken($item-md-border-color, 10%) !default; $item-md-forward-icon-color: $item-md-border-color !default; -ion-list[mode=md] { +.list[mode=md] { .item { margin-top: -1px; diff --git a/ionic/components/list/list.scss b/ionic/components/list/list.scss index 7f24a28d3e..29f68250db 100644 --- a/ionic/components/list/list.scss +++ b/ionic/components/list/list.scss @@ -3,7 +3,7 @@ // -------------------------------------------------- -ion-list { +.list { display: block; margin: 0; padding: 0; @@ -17,7 +17,7 @@ ion-list { } } -ion-list[inset] { +.list[inset] { overflow: hidden; ion-header { diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss index dcbc053f2f..5fdaa954e1 100644 --- a/ionic/components/list/modes/ios.scss +++ b/ionic/components/list/modes/ios.scss @@ -20,7 +20,7 @@ $list-ios-header-letter-spacing: 0.1rem !default; $list-ios-header-color: #333 !default; -ion-list[mode=ios] { +.list[mode=ios] { margin: 0 $list-ios-margin-right $list-ios-margin-bottom $list-ios-margin-left; ion-header { @@ -34,16 +34,16 @@ ion-list[mode=ios] { } -ion-list[mode=ios] + ion-list { +.list[mode=ios] + .list { margin-top: $list-ios-margin-top + $list-ios-margin-bottom; } -ion-list[mode=ios] + ion-list ion-header { +.list[mode=ios] + .list ion-header { margin-top: -$list-ios-margin-top; padding-top: 0; } -ion-list[mode=ios][inset] { +.list[mode=ios][inset] { margin: $list-inset-ios-margin-top $list-inset-ios-margin-right $list-inset-ios-margin-bottom $list-inset-ios-margin-left; border-radius: $list-inset-ios-border-radius; @@ -68,6 +68,6 @@ ion-list[mode=ios][inset] { } } -ion-list[mode=ios][inset] + ion-list[inset] { +.list[mode=ios][inset] + .list[inset] { margin-top: 0; } diff --git a/ionic/components/list/modes/material.scss b/ionic/components/list/modes/material.scss index 20bd08e8d2..c79553f0a9 100644 --- a/ionic/components/list/modes/material.scss +++ b/ionic/components/list/modes/material.scss @@ -18,7 +18,7 @@ $list-md-header-font-size: 1.4rem !default; $list-md-header-color: #858585 !default; -ion-list[mode=md] { +.list[mode=md] { margin: 0 $list-md-margin-right $list-md-margin-bottom $list-md-margin-left; ion-header { @@ -29,16 +29,16 @@ ion-list[mode=md] { } -ion-list[mode=md] + ion-list { +.list[mode=md] + .list { margin-top: $list-md-margin-top + $list-md-margin-bottom; } -ion-list[mode=md] + ion-list ion-header { +.list[mode=md] + .list ion-header { margin-top: -$list-md-margin-top; padding-top: 0; } -ion-list[mode=md][inset] { +.list[mode=md][inset] { margin: $list-inset-md-margin-top $list-inset-md-margin-right $list-inset-md-margin-bottom $list-inset-md-margin-left; border-radius: $list-inset-md-border-radius; @@ -63,6 +63,6 @@ ion-list[mode=md][inset] { } } -ion-list[mode=md][inset] + ion-list[inset] { +.list[mode=md][inset] + .list[inset] { margin-top: 0; } diff --git a/ionic/components/text-input/modes/ios.scss b/ionic/components/text-input/modes/ios.scss index 97676a0e63..9ed39d0300 100644 --- a/ionic/components/text-input/modes/ios.scss +++ b/ionic/components/text-input/modes/ios.scss @@ -3,7 +3,7 @@ // -------------------------------------------------- -ion-list[mode=ios], +.list[mode=ios], ion-card[mode=ios] { .text-input { diff --git a/ionic/components/text-input/modes/material.scss b/ionic/components/text-input/modes/material.scss index a7987b884d..6d8509b432 100644 --- a/ionic/components/text-input/modes/material.scss +++ b/ionic/components/text-input/modes/material.scss @@ -3,7 +3,7 @@ // -------------------------------------------------- -ion-list[mode=md], +.list[mode=md], ion-card[mode=md] { .text-input {