From 857fe32a70270ea8d80319782ff8125c3a9db060 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 9 Jul 2014 16:04:31 -0700 Subject: Refactor navs: new classes, remove separate pills & tabs files, drop justified nav because it never really worked --- docs/_includes/components/navs.html | 193 ++++++++++++++++++++---------------- 1 file changed, 110 insertions(+), 83 deletions(-) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html index 9e7600ac4..9e2885933 100644 --- a/docs/_includes/components/navs.html +++ b/docs/_includes/components/navs.html @@ -1,58 +1,93 @@

Navs

-

Navs available in Bootstrap have shared markup, starting with the base .nav class, as well as shared states. Swap modifier classes to switch between each style.

+

Navigation available in Bootstrap share general markup and styles, from the base .nav class to the active and disabled states. Swap modifier classes to switch between each style.

- -

Uses no modifier classes. No supported active state by default, given highly customizable nature of nav styles.

+ +

Roll your own navigation style by extending the base .nav component. All Bootstrap's nav components are built on top of this. Includes styles for the disabled state, but not the active state.

+{% highlight html %} + +{% endhighlight %} + +

Classes are used so your markup can be super flexible.

+ +{% highlight html %} + +{% endhighlight %} + -

Note the .nav-tabs class requires the .nav base class.

+

Takes the basic nav from above and adds the .nav-tabs class to generate a tabbed interface.

-
{% highlight html %} -