rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

.navbar docs: update -fixed-* callouts, fix -link

Browse Source 
* 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).
This commit is contained in:
Julian Thilo 2013-05-14 22:31:15 +02:00
parent 8544ef8734
commit 9af88380c4
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
docs/components.html
View File

@ -1197,13 +1197,13 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
<div class="bs-example"> <div class="bs-example">
<div class="navbar"> <div class="navbar">
<a href="#" class="navbar-brand">Brand</a> <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>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="navbar"> <div class="navbar">
<a href="#" class="navbar-brand">Brand</a> <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>
{% endhighlight %} {% endhighlight %}
@ -1236,16 +1236,9 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
<div class="bs-callout"> <div class="bs-callout">
<h4>Body padding required</h4> <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>&lt;body&gt;</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>&lt;body&gt;</code>. Try out your own values or use our snippet below. Tip: By default, the navbar is 50px high.</p>
{% highlight css %} {% highlight css %}
body { body { padding-top: 70px; }
padding-top: 64px;
}
@media screen and (min-width: 768px) {
body {
padding-top: 60px;
}
}
{% endhighlight %} {% endhighlight %}
<p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p> <p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p>
</div> </div>
@ -1272,16 +1265,9 @@ body {
<div class="bs-callout"> <div class="bs-callout">
<h4>Body padding required</h4> <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>&lt;body&gt;</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>&lt;body&gt;</code>. Try out your own values or use our snippet below. Tip: By default, the navbar is 50px high.</p>
{% highlight css %} {% highlight css %}
body { body { padding-bottom: 70px; }
padding-bottom: 64px;
}
@media screen and (min-width: 768px) {
body {
padding-bottom: 60px;
}
}
{% endhighlight %} {% endhighlight %}
<p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p> <p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p>
</div> </div>