From: Mark Otto Date: Thu, 4 Feb 2016 04:52:33 +0000 (-0800) Subject: fuck that other class, let's just get tabs and pills in there X-Git-Tag: v4.0.0-alpha.3~327^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b75a0ca9791a9ee816c8046bc83046073e231284;p=thirdparty%2Fbootstrap.git fuck that other class, let's just get tabs and pills in there --- diff --git a/docs/components/card.md b/docs/components/card.md index 28db0e3fab..53580d667c 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -211,42 +211,9 @@ Add an optional header and/or footer within a card. {% endexample %} -## Heading nav +## Header nav -- Custom card nav (full width) -- Tabs -- Pills -- Alignment: - - left - - center - - right - -{% example html %} -
-
- -
-
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-
-{% endexample %} - - - -Or, use Bootstrap's nav pills or tabs to a card header. Be sure to always include a `.pull-*-*` utility class for proper alignment. +Use Bootstrap's nav pills or tabs within a card header. Be sure to always include a `.pull-*-*` utility class for proper alignment. {% example html %}
diff --git a/scss/_card.scss b/scss/_card.scss index e0d98d2762..ee6b473e9f 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -117,17 +117,6 @@ margin-left: -($card-spacer-x / 2); } -.card-nav { - - .nav-item { - float: left; - - + .nav-item { - margin-left: $nav-item-margin; - } - } - -} // // Background variations