From f29e3263b04fd2ecbd42e864e03abc15439b4a1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:16:25 -0800 Subject: [PATCH] follow up to #1702, add callout on component alignment in tabs/pills --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/components.html | 7 ++++--- docs/templates/pages/components.mustache | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3c655b03a1dc2174c6325d0e3691c9371c5ca2fd..d3f2da9ad2106e660e66d763f57ad33d936dc9ca 100644 GIT binary patch delta 445 zcmZ2JlX>|}W}X0VW)?065MW}O$fKxy*hSU<(s6YODqet)HlZ>a5A%CK|xZ z*O~NMfr*)EvgBqHHjwv@T5S&AyjKKdl+X!%ro&c~|DO_{9B_&aBoc8-W^&yLai$|6 zQCX14wiDh+Jf)NVNW4iW9U%I_DnFlefyg15W{f1i=2RdOPwuogn%!NejgZW~d)f}h R13KR3j1v|}W}X0VW)?065b$A~$fKy7Z>i^B0K}yg+zgB?-x(PgSVVx5D9Qp<*+5DP zEGP37NHYQT&9H?EY`lGn11KMW4{X`X1XHEV#(Ew(? z&ZO50AbpaXO<+R7oA-)B|{C`RoB(m*< zHxf_jq(2gG(n$x1ez3~VCtV

Powerful base class

All nav components here—tabs, pills, and lists—share the same base markup and styles through the .nav class.

-

Why tabs and pills

-

Tabs and pills in Bootstrap are built on a <ul> with the same core HTML, a list of links. Swap between tabs or pills with only a class.

-

Both options are great for sub-sections of content or navigating between pages of related content.

+

When to use

+

Tabs and pills are great for sections of content or navigating between pages of related content.

+

Component alignment

+

To align nav links, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.

Basic tabs

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 1f466aa5dd..0a7affafee 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -278,9 +278,10 @@

{{_i}}Powerful base class{{/i}}

{{_i}}All nav components here—tabs, pills, and lists—share the same base markup and styles through the .nav class.{{/i}}

-

{{_i}}Why tabs and pills{{/i}}

-

{{_i}}Tabs and pills in Bootstrap are built on a <ul> with the same core HTML, a list of links. Swap between tabs or pills with only a class.{{/i}}

-

{{_i}}Both options are great for sub-sections of content or navigating between pages of related content.{{/i}}

+

{{_i}}When to use{{/i}}

+

{{_i}}Tabs and pills are great for sections of content or navigating between pages of related content.{{/i}}

+

{{_i}}Component alignment{{/i}}

+

{{_i}}To align nav links, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

{{_i}}Basic tabs{{/i}}