diff options
| author | Julian Thilo <[email protected]> | 2013-05-14 22:31:15 +0200 |
|---|---|---|
| committer | Julian Thilo <[email protected]> | 2013-05-14 22:31:15 +0200 |
| commit | 9af88380c440f35387292946b2e18ad7b2ab84b2 (patch) | |
| tree | 6d630c6f311d3acb6d5f33f426b3862436e00494 /docs/components.html | |
| parent | 8544ef8734de46b927895f18ae4f149fa69a6fd2 (diff) | |
| download | bootstrap-9af88380c440f35387292946b2e18ad7b2ab84b2.tar.xz bootstrap-9af88380c440f35387292946b2e18ad7b2ab84b2.zip | |
.navbar docs: update -fixed-* callouts, fix -link
* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/docs/components.html b/docs/components.html index 23c20d94d..bcf3ad7a1 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1197,13 +1197,13 @@ 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 %} @@ -1236,16 +1236,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> @@ -1272,16 +1265,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> |