diff --git a/ionic/components/app/test/material/index.ts b/ionic/components/app/test/material/index.ts index 2753ff3348..3782478035 100644 --- a/ionic/components/app/test/material/index.ts +++ b/ionic/components/app/test/material/index.ts @@ -38,9 +38,9 @@ import {App, ActionMenu, IonicApp, IonicView, Register} from 'ionic/ionic'; Keep close to Nature's heart... and break clear away, once in awhile, and climb a mountain or spend a week in the woods. Wash your spirit clean. - + Posted 5 days ago - + diff --git a/ionic/components/app/test/sink/pages/card.ts b/ionic/components/app/test/sink/pages/card.ts index 9c2deaaa2e..272e5b8f52 100644 --- a/ionic/components/app/test/sink/pages/card.ts +++ b/ionic/components/app/test/sink/pages/card.ts @@ -30,10 +30,6 @@ import {SinkPage} from '../sink-page'; - - Card Footer - - diff --git a/ionic/components/app/test/sink/pages/list.ts b/ionic/components/app/test/sink/pages/list.ts index 2a1ad389af..e2d3a0f849 100644 --- a/ionic/components/app/test/sink/pages/list.ts +++ b/ionic/components/app/test/sink/pages/list.ts @@ -35,10 +35,6 @@ import {SinkPage} from '../sink-page'; Item - - List Footer - - ` diff --git a/ionic/components/app/test/snapcat/detail.html b/ionic/components/app/test/snapcat/detail.html index 4e7f697e43..8256c54e19 100644 --- a/ionic/components/app/test/snapcat/detail.html +++ b/ionic/components/app/test/snapcat/detail.html @@ -10,10 +10,6 @@ - - Posted {{post.day}} ago - - diff --git a/ionic/components/app/test/snapcat/feed.html b/ionic/components/app/test/snapcat/feed.html index 5221e98d57..7b7d9ee844 100644 --- a/ionic/components/app/test/snapcat/feed.html +++ b/ionic/components/app/test/snapcat/feed.html @@ -7,8 +7,5 @@ {{post.text}} - diff --git a/ionic/components/app/test/snapcat/main.html b/ionic/components/app/test/snapcat/main.html index 9d5b082af0..5f6ae001fe 100644 --- a/ionic/components/app/test/snapcat/main.html +++ b/ionic/components/app/test/snapcat/main.html @@ -49,18 +49,15 @@ .card { box-shadow: none !important; } - .card .card-content, .card .card-footer { + .card .card-content { font-family: 'lato'; font-size: 16px; line-height: 25px; } - .card .card-footer { - color: #B8B8B8; - } .card .item { border: none !important; } - .card .card-content, .card .card-footer { + .card .card-content { padding: 25px !important; } .item { diff --git a/ionic/components/card/modes/ios.scss b/ionic/components/card/modes/ios.scss index 5034f18db4..3c80b8f3a0 100644 --- a/ionic/components/card/modes/ios.scss +++ b/ionic/components/card/modes/ios.scss @@ -9,8 +9,6 @@ $card-ios-font-size: 1.4rem !default; $card-ios-header-background-color: $card-ios-background-color !default; $card-ios-header-padding: 10px; -$card-ios-footer-background-color: $card-ios-background-color !default; -$card-ios-footer-padding: 10px; .card.list[mode=ios] { @@ -40,12 +38,7 @@ $card-ios-footer-padding: 10px; ion-header { padding: $card-ios-header-padding; - background-color: $card-ios-footer-background-color; - } - - ion-footer { - padding: $card-ios-footer-padding; - background-color: $card-ios-footer-background-color; + background-color: $card-ios-header-background-color; } } diff --git a/ionic/components/card/modes/material.scss b/ionic/components/card/modes/material.scss index dcf6e393bf..03794fd62d 100644 --- a/ionic/components/card/modes/material.scss +++ b/ionic/components/card/modes/material.scss @@ -11,9 +11,6 @@ $card-md-header-font-size: 2.4rem !default; $card-md-header-background-color: $card-md-background-color !default; $card-md-header-padding: 16px; -$card-md-footer-background-color: $card-md-background-color !default; -$card-md-footer-padding: 16px; - .card.list[mode=md] { background: $card-md-background-color; @@ -49,12 +46,7 @@ $card-md-footer-padding: 16px; ion-header { padding: $card-md-header-padding; font-size: $card-md-header-font-size; - background-color: $card-md-footer-background-color; - } - - ion-footer { - padding: $card-md-footer-padding; - background-color: $card-md-footer-background-color; + background-color: $card-md-header-background-color; } .item > img { diff --git a/ionic/components/card/test/basic/main.html b/ionic/components/card/test/basic/main.html index 8e52aaa931..f553b019a5 100644 --- a/ionic/components/card/test/basic/main.html +++ b/ionic/components/card/test/basic/main.html @@ -14,10 +14,6 @@ - - Card Footer - - @@ -53,10 +49,6 @@ - - Card Footer - - @@ -64,7 +56,7 @@
- Card, no header or footer + Card, no header
diff --git a/ionic/components/list/list.scss b/ionic/components/list/list.scss index 96d0095936..39f5d61551 100644 --- a/ionic/components/list/list.scss +++ b/ionic/components/list/list.scss @@ -11,8 +11,7 @@ $list-inset-margin: 10px !default; padding: 0; list-style-type: none; - ion-header, - ion-footer { + ion-header { display: block; overflow: hidden; white-space: nowrap; diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss index ce3dec380f..75bb865714 100644 --- a/ionic/components/list/modes/ios.scss +++ b/ionic/components/list/modes/ios.scss @@ -8,12 +8,6 @@ $list-ios-header-font-weight: 500 !default; $list-ios-header-letter-spacing: 0.1rem !default; $list-ios-header-color: #333 !default; -$list-ios-footer-padding: 10px $item-ios-padding-right 10px $item-ios-padding-left !default; -$list-ios-footer-font-size: 1.2rem !default; -$list-ios-footer-font-weight: 500 !default; -$list-ios-footer-letter-spacing: 0.1rem !default; -$list-ios-footer-color: #333 !default; - .list[mode=ios] { @@ -26,15 +20,6 @@ $list-ios-footer-color: #333 !default; color: $list-ios-header-color; } - ion-footer { - padding: $list-ios-footer-padding; - font-size: $list-ios-footer-font-size; - font-weight: $list-ios-footer-font-weight; - letter-spacing: $list-ios-footer-letter-spacing; - text-transform: uppercase; - color: $list-ios-footer-color; - } - &[inset] ion-header { padding-top: 10px; } diff --git a/ionic/components/list/modes/material.scss b/ionic/components/list/modes/material.scss index 71b2929bd2..fe1cfa4b66 100644 --- a/ionic/components/list/modes/material.scss +++ b/ionic/components/list/modes/material.scss @@ -3,12 +3,8 @@ // -------------------------------------------------- $list-md-header-padding: 16px $item-md-padding-right 16px $item-md-padding-left !default; -$list-md-header-font-size: 1.6rem !default; -$list-md-header-color: #222 !default; - -$list-md-footer-padding: 16px $item-md-padding-right 16px $item-md-padding-left !default; -$list-md-footer-font-size: 1.2rem !default; -$list-md-footer-color: #222 !default; +$list-md-header-font-size: 1.4rem !default; +$list-md-header-color: #858585 !default; .list[mode=md] { @@ -19,11 +15,4 @@ $list-md-footer-color: #222 !default; color: $list-md-header-color; } - ion-footer { - padding: $list-md-footer-padding; - font-size: $list-md-footer-font-size; - text-transform: uppercase; - color: $list-md-footer-color; - } - } diff --git a/ionic/components/list/test/headers-footers/main.html b/ionic/components/list/test/headers-footers/main.html index 54f40d0f9b..a4f8787634 100644 --- a/ionic/components/list/test/headers-footers/main.html +++ b/ionic/components/list/test/headers-footers/main.html @@ -1,4 +1,4 @@ -List Headers/Footers +List Headers @@ -44,10 +44,6 @@ - - List Footer - - @@ -76,8 +72,4 @@ - - List Footer with text that is also too long why do you do this all the time plz stop its too long! - - diff --git a/ionic/components/list/test/inset/main.html b/ionic/components/list/test/inset/main.html index bd23045a56..b0cd9f8cdb 100644 --- a/ionic/components/list/test/inset/main.html +++ b/ionic/components/list/test/inset/main.html @@ -11,9 +11,6 @@ Keep close to Nature's heart... and break clear away, once in awhile, and climb a mountain or spend a week in the woods. Wash your spirit clean. - - List Footer - @@ -49,10 +46,6 @@ - - list Footer - - @@ -60,7 +53,7 @@
- Inset List, no header or footer + Inset List, no header