diff options
| author | Mark Otto <[email protected]> | 2013-05-14 23:28:09 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-14 23:28:09 -0700 |
| commit | 31dcb911893c1f7b6eebe097705a3e64568c8654 (patch) | |
| tree | d07fc6a206ef5e9377a6b80ad1d62a01112868bd /docs/components.html | |
| parent | fcb7c9da6f5082e1306fab096c16020b4227c967 (diff) | |
| parent | 57856e6cfb21022035d8611607b15eb3a0cef76a (diff) | |
| download | bootstrap-31dcb911893c1f7b6eebe097705a3e64568c8654.tar.xz bootstrap-31dcb911893c1f7b6eebe097705a3e64568c8654.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/docs/components.html b/docs/components.html index d192156dc..66573758a 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1176,18 +1176,18 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na <div class="bs-example"> <div class="navbar"> <a href="#" class="navbar-brand">Brand</a> - <p class="pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> + <p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> </div> </div> {% highlight html %} <div class="navbar"> <a href="#" class="navbar-brand">Brand</a> - <p class="pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> + <p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> </div> {% endhighlight %} <h3 id="navbar-component-alignment">Component alignment</h3> - <p>Align nav links, search form, or text, 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> + <p>Align nav links, forms, buttons, or text, using the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction. To align nav links, put them in a separate <code><ul></code> with the respective utility class applied.</p> <h2>Optional display variations</h2> @@ -1215,16 +1215,9 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na <div class="bs-callout"> <h4>Body padding required</h4> - <p>The fixed navbar will overlay your other content, unless you add <code>padding</code> to the top of the <code><body></code>. The navbar itself has a height of 54px by default. At 768px and above, its height shrinks to 50px. Try out your own values or use our snippet below:</p> + <p>The fixed navbar will overlay your other content, unless you add <code>padding</code> to the top of the <code><body></code>. Try out your own values or use our snippet below. Tip: By default, the navbar is 50px high.</p> {% highlight css %} -body { - padding-top: 64px; -} -@media screen and (min-width: 768px) { - body { - padding-top: 60px; - } -} +body { padding-top: 70px; } {% endhighlight %} <p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p> </div> @@ -1251,16 +1244,9 @@ body { <div class="bs-callout"> <h4>Body padding required</h4> - <p>The fixed navbar will overlay your other content, unless you add <code>padding</code> to the bottom of the <code><body></code>. The navbar itself has a height of 54px by default. At 768px and above, its height shrinks to 50px. Try out your own values or use our snippet below:</p> + <p>The fixed navbar will overlay your other content, unless you add <code>padding</code> to the bottom of the <code><body></code>. Try out your own values or use our snippet below. Tip: By default, the navbar is 50px high.</p> {% highlight css %} -body { - padding-bottom: 64px; -} -@media screen and (min-width: 768px) { - body { - padding-bottom: 60px; - } -} +body { padding-bottom: 70px; } {% endhighlight %} <p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p> </div> |