From: Mark Otto Date: Thu, 12 May 2016 03:22:07 +0000 (-0700) Subject: Update card header and footer X-Git-Tag: v4.0.0-alpha.3~74^2^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=964811d48d1e9b2c12d356163d9f3cfcbf758c8f;p=thirdparty%2Fbootstrap.git Update card header and footer - Remove the box-shadow and switch back to border to match .card basics - Update the header nav margin override--since we restored the border, we need that default negative margin at the bottom --- diff --git a/scss/_card.scss b/scss/_card.scss index 0b6a0aa030..fdc5998de5 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -71,9 +71,7 @@ @include clearfix; padding: $card-spacer-y $card-spacer-x; background-color: $card-cap-bg; - // 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; + border-bottom: $card-border-width solid $card-border-color; &:first-child { @include border-radius($card-border-radius-inner $card-border-radius-inner 0 0); @@ -84,9 +82,7 @@ @include clearfix; padding: $card-spacer-y $card-spacer-x; background-color: $card-cap-bg; - // 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; + border-top: $card-border-width solid $card-border-color; &:last-child { @include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner); @@ -103,10 +99,6 @@ margin-bottom: -$card-spacer-y; margin-left: -($card-spacer-x / 2); border-bottom: 0; - - .nav-item { - margin-bottom: 0; - } } .card-header-pills {