Merge branch 'v4-card-fuckery' into v4-dev

3 files changed, 31 insertions, 17 deletions

diff --git a/scss/_card.scss b/scss/_card.scss
index 3982f6e85..ee6b473e9 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -7,8 +7,10 @@
   display: block;
   margin-bottom: $card-spacer-y;
   background-color: $card-bg;
-  border: $card-border-width solid $card-border-color;
+  // border: $card-border-width solid $card-border-color;
   @include border-radius($card-border-radius);
+  // Doesn't use mixin so that cards always have a "border"
+  box-shadow: inset 0 0 0 $card-border-width $card-border-color;
 }
 
 .card-block {
@@ -72,7 +74,9 @@
   @include clearfix;
   padding: $card-spacer-y $card-spacer-x;
   background-color: $card-cap-bg;
-  border-bottom: $card-border-width solid $card-border-color;
+  // border-bottom: $card-border-width solid $card-border-color;
+  // Doesn't use mixin so that cards always have a "border"
+  box-shadow: inset 0 0 0 $card-border-width $card-border-color;
 
   &:first-child {
     @include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
@@ -83,7 +87,9 @@
   @include clearfix;
   padding: $card-spacer-y $card-spacer-x;
   background-color: $card-cap-bg;
-  border-top: $card-border-width solid $card-border-color;
+  // border-top: $card-border-width solid $card-border-color;
+  // Doesn't use mixin so that cards always have a "border"
+  box-shadow: inset 0 0 0 $card-border-width $card-border-color;
 
   &:last-child {
     @include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
@@ -92,6 +98,27 @@
 
 
 //
+// Header navs
+//
+
+.card-header-tabs {
+  margin-right: -($card-spacer-x / 2);
+  margin-bottom: -$card-spacer-y;
+  margin-left: -($card-spacer-x / 2);
+  border-bottom: 0;
+
+  .nav-item {
+    margin-bottom: 0;
+  }
+}
+
+.card-header-pills {
+  margin-right: -($card-spacer-x / 2);
+  margin-left: -($card-spacer-x / 2);
+}
+
+
+//
 // Background variations
 //
 
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 5115e56fa..f00afd1f7 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -34,21 +34,8 @@
 
 .list-group-flush {
   .list-group-item {
-    border-width: $list-group-border-width 0;
     border-radius: 0;
   }
-
-  &:first-child {
-    .list-group-item:first-child {
-      border-top: 0;
-    }
-  }
-
-  &:last-child {
-    .list-group-item:last-child {
-      border-bottom: 0;
-    }
-  }
 }
 
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index a9159e543..11a4f4751 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -538,7 +538,7 @@ $card-spacer-x:            1.25rem !default;
 $card-spacer-y:            .75rem !default;
 $card-border-width:        1px !default;
 $card-border-radius:       $border-radius !default;
-$card-border-color:        #e5e5e5 !default;
+$card-border-color:        rgba(0,0,0,.125) !default;
 $card-border-radius-inner: $card-border-radius !default;
 $card-cap-bg:              #f5f5f5 !default;
 $card-bg:                  #fff !default;