+ Pretty Hate Machine
+Nine Inch Nails
+
+ Pretty Hate Machine
+Nine Inch Nails
+diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index 39f5f47391..7e25431a26 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -2036,16 +2036,18 @@ a.button { color: #3a87ad; } .card { - margin: 10px; + overflow: hidden; + margin: 20px 10px; border: none; border-radius: 2px; background-color: white; - box-shadow: inset 0 0 1px #666666; } + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15); } .card-header { padding: 10px; - border-bottom: 1px solid #dddddd; - background-color: #eeeeee; } + border-top-left-radius: 2px; + border-top-right-radius: 2px; + background-color: whitesmoke; } .card-header.card-header-secondary { background-color: whitesmoke; } .card-header.card-header-primary { @@ -2066,8 +2068,9 @@ a.button { .card-footer { padding: 10px; - border-top: 1px solid #dddddd; - background-color: #eeeeee; } + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; + background-color: whitesmoke; } .slide-in-up { opacity: 0; @@ -2237,7 +2240,7 @@ a.button { -moz-animation: spin 0.75s linear infinite; animation: spin 0.75s linear infinite; } .icon-loading:before { - content: "\e036"; } + content: "\e144"; } .icon-refreshing { font-family: 'ionicons'; @@ -2252,7 +2255,7 @@ a.button { -moz-animation: spin 0.75s linear infinite; animation: spin 0.75s linear infinite; } .icon-refreshing:before { - content: "\e036"; } + content: "\e144"; } .hidden, .hide { diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css index b141072749..2b3e6afbf4 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -2712,15 +2712,17 @@ .ionic .alert-info h4 { color: #3a87ad; } .ionic .card { - margin: 10px; + overflow: hidden; + margin: 20px 10px; border: none; border-radius: 2px; background-color: white; - box-shadow: inset 0 0 1px #666666; } + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15); } .ionic .card-header { padding: 10px; - border-bottom: 1px solid #dddddd; - background-color: #eeeeee; } + border-top-left-radius: 2px; + border-top-right-radius: 2px; + background-color: whitesmoke; } .ionic .card-header.card-header-secondary { background-color: whitesmoke; } .ionic .card-header.card-header-primary { @@ -2739,8 +2741,9 @@ padding: 10px; } .ionic .card-footer { padding: 10px; - border-top: 1px solid #dddddd; - background-color: #eeeeee; } + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; + background-color: whitesmoke; } .ionic .slide-in-up { opacity: 0; -webkit-transform: translate3d(0, 100%, 0); @@ -2854,7 +2857,7 @@ -moz-animation: spin 0.75s linear infinite; animation: spin 0.75s linear infinite; } .ionic .icon-loading:before { - content: "\e036"; } + content: "\e144"; } .ionic .icon-refreshing { font-family: 'ionicons'; speak: none; @@ -2868,7 +2871,7 @@ -moz-animation: spin 0.75s linear infinite; animation: spin 0.75s linear infinite; } .ionic .icon-refreshing:before { - content: "\e036"; } + content: "\e144"; } .ionic .hidden, .ionic .hide { display: none !important; } diff --git a/dist/css/ionic.css b/dist/css/ionic.css index fc4927a2df..d1d6e57419 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -3257,16 +3257,18 @@ a.button { color: #3a87ad; } .card { - margin: 10px; + overflow: hidden; + margin: 20px 10px; border: none; border-radius: 2px; background-color: white; - box-shadow: inset 0 0 1px #666666; } + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15); } .card-header { padding: 10px; - border-bottom: 1px solid #dddddd; - background-color: #eeeeee; } + border-top-left-radius: 2px; + border-top-right-radius: 2px; + background-color: whitesmoke; } .card-header.card-header-secondary { background-color: whitesmoke; } .card-header.card-header-primary { @@ -3287,8 +3289,9 @@ a.button { .card-footer { padding: 10px; - border-top: 1px solid #dddddd; - background-color: #eeeeee; } + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; + background-color: whitesmoke; } .slide-box { background-color: #000; @@ -3509,7 +3512,7 @@ a.button { -moz-animation: spin 0.75s linear infinite; animation: spin 0.75s linear infinite; } .icon-loading:before { - content: "\e036"; } + content: "\e144"; } .icon-refreshing { font-family: 'ionicons'; @@ -3524,7 +3527,7 @@ a.button { -moz-animation: spin 0.75s linear infinite; animation: spin 0.75s linear infinite; } .icon-refreshing:before { - content: "\e036"; } + content: "\e144"; } .hidden, .hide { diff --git a/scss/ionic/_card.scss b/scss/ionic/_card.scss index a5750cb6dd..c97a2b41a6 100644 --- a/scss/ionic/_card.scss +++ b/scss/ionic/_card.scss @@ -3,18 +3,22 @@ // -------------------------------------------------- .card { - margin: $content-padding; + overflow: hidden; + margin: ($content-padding * 2) $content-padding; border: none; + //border: $card-border-width solid $card-border-color; border-radius: $card-border-radius; - background-color: $card-body-bg; - box-shadow: inset 0 0 $card-border-width #666; + box-shadow: 0 1px 2px rgba(0, 0, 0, .15); } .card-header { padding: $card-padding; - border-bottom: $card-border-width solid $card-border-color; + //border-bottom: $card-border-width solid $card-border-color; + border-top-left-radius: $card-border-radius; + border-top-right-radius: $card-border-radius; background-color: $card-header-bg; + &.card-header-secondary { background-color: $brand-secondary; } &.card-header-primary { background-color: $brand-primary; } @@ -31,6 +35,8 @@ .card-footer { padding: $card-padding; - border-top: $card-border-width solid $card-border-color; + //border-top: $card-border-width solid $card-border-color; + border-bottom-right-radius: $card-border-radius; + border-bottom-left-radius: $card-border-radius; background-color: $card-footer-bg; } diff --git a/scss/ionic/_icons.scss b/scss/ionic/_icons.scss index 3b9452b085..aa58d41f12 100644 --- a/scss/ionic/_icons.scss +++ b/scss/ionic/_icons.scss @@ -66,7 +66,7 @@ animation:spin .75s linear infinite; &:before { - content: "\e036"; + content: "\e144"; } } @@ -85,6 +85,6 @@ animation:spin .75s linear infinite; &:before { - content: "\e036"; + content: "\e144"; } } \ No newline at end of file diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss index e2f9aa9d6f..efeb334941 100644 --- a/scss/ionic/_variables.scss +++ b/scss/ionic/_variables.scss @@ -406,12 +406,12 @@ $menu-animation-speed: 200ms; // Cards // ------------------------------- -$card-header-bg: #eee; +$card-header-bg: #F5F5F5; $card-body-bg: #fff; -$card-footer-bg: #eee; +$card-footer-bg: #F5F5F5; $card-padding: 10px !default; $card-border-width: 1px !default; -$card-border-color: #ddd; +$card-border-color: #ccc; $card-border-radius: 2px !default; diff --git a/test/cards.html b/test/cards.html index fcc40382ad..3cdd5f9923 100644 --- a/test/cards.html +++ b/test/cards.html @@ -15,31 +15,105 @@
+ Nine Inch Nails
+
+ Nine Inch Nails
+