From 5230c9ad2cd239fe9eaaa7f747fab0141b8fa471 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@gmail.com>
Date: Thu, 24 Oct 2013 21:03:56 -0500
Subject: [PATCH] card border updates

---
 dist/css/ionic-ios7.css    | 31 ++++++++++++++++++++++++-------
 dist/css/ionic-scoped.css  | 26 ++++++++++++++++++++------
 dist/css/ionic.css         | 31 ++++++++++++++++++++++++-------
 scss/ionic/_card.scss      | 25 +++++++++++++++++++++++--
 scss/ionic/_items.scss     |  7 +++----
 scss/ionic/_variables.scss | 11 ++++++-----
 6 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css
index 88fe16d933..24133bfe67 100644
--- a/dist/css/ionic-ios7.css
+++ b/dist/css/ionic-ios7.css
@@ -1147,6 +1147,9 @@ a.item {
   position: absolute;
   top: 0;
   height: 100%;
+  font-size: 32px; }
+
+.item-content .fill-icon {
   font-size: 28px; }
 
 .item-icon-left .item-content {
@@ -1236,10 +1239,6 @@ button.item-icon-right .item-content:after {
   color: #222222;
   font-weight: bold; }
 
-.card.list .item-divider {
-  margin-right: 0;
-  margin-left: 0; }
-
 .item-sliding {
   -webkit-transition: -webkit-transform 0.1s ease-in-out; }
 
@@ -1353,10 +1352,28 @@ button.item-icon-right .item-content:after {
 .card {
   overflow: hidden;
   margin: 20px 10px;
-  border: none;
-  border-radius: 2px;
   background-color: white;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15); }
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
+  border-radius: 2px; }
+
+.card .item {
+  margin-left: 0;
+  margin-right: 0; }
+  .card .item:first-child {
+    margin-top: 0;
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px; }
+  .card .item:last-child {
+    margin-bottom: 0;
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px; }
+
+.card.list .item:last-child {
+  margin-bottom: -1px; }
+
+.card.list .item-divider {
+  margin-right: 0;
+  margin-left: 0; }
 
 form {
   margin: 0 0 1.42857; }
diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css
index 549bdebe44..752e13d385 100644
--- a/dist/css/ionic-scoped.css
+++ b/dist/css/ionic-scoped.css
@@ -1867,6 +1867,8 @@
     position: absolute;
     top: 0;
     height: 100%;
+    font-size: 32px; }
+  .ionic .item-content .fill-icon {
     font-size: 28px; }
   .ionic .item-icon-left .item-content {
     padding-left: 45px; }
@@ -1945,9 +1947,6 @@
     box-shadow: inset 0 0 1px #666666;
     color: #222222;
     font-weight: bold; }
-  .ionic .card.list .item-divider {
-    margin-right: 0;
-    margin-left: 0; }
   .ionic .item-sliding {
     -webkit-transition: -webkit-transform 0.1s ease-in-out; }
   .ionic .item-reordering {
@@ -2037,10 +2036,25 @@
   .ionic .card {
     overflow: hidden;
     margin: 20px 10px;
-    border: none;
-    border-radius: 2px;
     background-color: white;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15); }
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
+    border-radius: 2px; }
+  .ionic .card .item {
+    margin-left: 0;
+    margin-right: 0; }
+    .ionic .card .item:first-child {
+      margin-top: 0;
+      border-top-left-radius: 2px;
+      border-top-right-radius: 2px; }
+    .ionic .card .item:last-child {
+      margin-bottom: 0;
+      border-bottom-left-radius: 2px;
+      border-bottom-right-radius: 2px; }
+  .ionic .card.list .item:last-child {
+    margin-bottom: -1px; }
+  .ionic .card.list .item-divider {
+    margin-right: 0;
+    margin-left: 0; }
   .ionic form {
     margin: 0 0 1.42857; }
   .ionic legend {
diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 559d4c1e1f..b22bb857bb 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -2290,6 +2290,9 @@ a.item {
   position: absolute;
   top: 0;
   height: 100%;
+  font-size: 32px; }
+
+.item-content .fill-icon {
   font-size: 28px; }
 
 .item-icon-left .item-content {
@@ -2379,10 +2382,6 @@ button.item-icon-right .item-content:after {
   color: #222222;
   font-weight: bold; }
 
-.card.list .item-divider {
-  margin-right: 0;
-  margin-left: 0; }
-
 .item-sliding {
   -webkit-transition: -webkit-transform 0.1s ease-in-out; }
 
@@ -2496,10 +2495,28 @@ button.item-icon-right .item-content:after {
 .card {
   overflow: hidden;
   margin: 20px 10px;
-  border: none;
-  border-radius: 2px;
   background-color: white;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15); }
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
+  border-radius: 2px; }
+
+.card .item {
+  margin-left: 0;
+  margin-right: 0; }
+  .card .item:first-child {
+    margin-top: 0;
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px; }
+  .card .item:last-child {
+    margin-bottom: 0;
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px; }
+
+.card.list .item:last-child {
+  margin-bottom: -1px; }
+
+.card.list .item-divider {
+  margin-right: 0;
+  margin-left: 0; }
 
 form {
   margin: 0 0 1.42857; }
diff --git a/scss/ionic/_card.scss b/scss/ionic/_card.scss
index 5bc2b4c2d2..4b2d313f0e 100644
--- a/scss/ionic/_card.scss
+++ b/scss/ionic/_card.scss
@@ -5,8 +5,29 @@
 .card {
   overflow: hidden;
   margin: ($content-padding * 2) $content-padding;
-  border: none;
-  border-radius: $card-border-radius;
   background-color: $card-body-bg;
   box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
+  border-radius: $card-border-radius;
+}
+.card .item {
+  margin-left: 0;
+  margin-right: 0;
+
+  &:first-child {
+    margin-top: 0;
+    border-top-left-radius: $card-border-radius;
+    border-top-right-radius: $card-border-radius;
+  }
+  &:last-child {
+    margin-bottom: 0;
+    border-bottom-left-radius: $card-border-radius;
+    border-bottom-right-radius: $card-border-radius;
+  }
+}
+.card.list .item:last-child {
+  margin-bottom: $item-border-width * -1;
+}
+.card.list .item-divider {
+  margin-right: 0;
+  margin-left: 0;
 }
\ No newline at end of file
diff --git a/scss/ionic/_items.scss b/scss/ionic/_items.scss
index f1ebceaa62..04f71af404 100644
--- a/scss/ionic/_items.scss
+++ b/scss/ionic/_items.scss
@@ -131,7 +131,10 @@ a.item {
   top: 0;
   height: 100%;
   font-size: $item-icon-font-size;
+}
 
+.item-content .fill-icon {
+  font-size: $item-icon-fill-font-size;
 }
 
 .item-icon-left .item-content {
@@ -251,10 +254,6 @@ button.item-icon-right {
   color: $item-divider-color;
   font-weight: bold;
 }
-.card.list .item-divider {
-  margin-right: 0;
-  margin-left: 0;
-}
 
 
 // Item Animations
diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss
index fe9819857a..6246b9c494 100644
--- a/scss/ionic/_variables.scss
+++ b/scss/ionic/_variables.scss
@@ -397,13 +397,14 @@ $item-divider-bg:              #f5f5f5;
 $item-divider-color:           #222;
 $item-divider-padding:         5px 15px;
 
-$item-icon-font-size:          28px !default;
+$item-icon-font-size:          32px !default;
+$item-icon-fill-font-size:     28px !default;
 
-$item-thumbnail-width:           40px !default;
-$item-thumbnail-height:          40px !default;
+$item-thumbnail-width:         40px !default;
+$item-thumbnail-height:        40px !default;
 
-$item-thumbnail-lrg-width:        80px !default;
-$item-thumbnail-lrg-height:       80px !default;
+$item-thumbnail-lrg-width:     80px !default;
+$item-thumbnail-lrg-height:    80px !default;
 
 
 // Icons