diff options
| author | Mark Otto <[email protected]> | 2012-02-05 00:16:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-05 00:16:25 -0800 |
| commit | f29e3263b04fd2ecbd42e864e03abc15439b4a1b (patch) | |
| tree | 0bab0fab898c6a211fca662cae51c2a6f693e418 /docs | |
| parent | cdb1ad1a52a9f55c63003b7b62ef8b1e9c6fcfaf (diff) | |
| download | bootstrap-f29e3263b04fd2ecbd42e864e03abc15439b4a1b.tar.xz bootstrap-f29e3263b04fd2ecbd42e864e03abc15439b4a1b.zip | |
follow up to #1702, add callout on component alignment in tabs/pills
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 52391 -> 52391 bytes | |||
| -rw-r--r-- | docs/components.html | 7 | ||||
| -rw-r--r-- | 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 Binary files differindex 3c655b03a..d3f2da9ad 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/components.html b/docs/components.html index 1c5bc5abe..06ca2560c 100644 --- a/docs/components.html +++ b/docs/components.html @@ -354,9 +354,10 @@ <div class="span4"> <h3>Powerful base class</h3> <p>All nav components here—tabs, pills, and lists—<strong>share the same base markup and styles</strong> through the <code>.nav</code> class.</p> - <h3>Why tabs and pills</h3> - <p>Tabs and pills in Bootstrap are built on a <code><ul></code> with the same core HTML, a list of links. Swap between tabs or pills with only a class.</p> - <p>Both options are great for sub-sections of content or navigating between pages of related content.</p> + <h3>When to use</h3> + <p>Tabs and pills are great for sections of content or navigating between pages of related content.</p> + <h3>Component alignment</h3> + <p>To align nav links, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p> </div> <div class="span4"> <h3>Basic tabs</h3> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 1f466aa5d..0a7affafe 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -278,9 +278,10 @@ <div class="span4"> <h3>{{_i}}Powerful base class{{/i}}</h3> <p>{{_i}}All nav components here—tabs, pills, and lists—<strong>share the same base markup and styles</strong> through the <code>.nav</code> class.{{/i}}</p> - <h3>{{_i}}Why tabs and pills{{/i}}</h3> - <p>{{_i}}Tabs and pills in Bootstrap are built on a <code><ul></code> with the same core HTML, a list of links. Swap between tabs or pills with only a class.{{/i}}</p> - <p>{{_i}}Both options are great for sub-sections of content or navigating between pages of related content.{{/i}}</p> + <h3>{{_i}}When to use{{/i}}</h3> + <p>{{_i}}Tabs and pills are great for sections of content or navigating between pages of related content.{{/i}}</p> + <h3>{{_i}}Component alignment{{/i}}</h3> + <p>{{_i}}To align nav links, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.{{/i}}</p> </div> <div class="span4"> <h3>{{_i}}Basic tabs{{/i}}</h3> |