0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00

address issue #414 and fix up a number of docs loose ends

This commit is contained in:
Mark Otto 2011-10-26 23:24:22 -07:00
parent 648c468927
commit b4c894961c
5 changed files with 24 additions and 54 deletions

View File

@ -15,7 +15,7 @@ body {
background-repeat: repeat-x; background-repeat: repeat-x;
} }
/* Tweak topbar brand link to be super sleek /* Tweak navbar brand link to be super sleek
-------------------------------------------------- */ -------------------------------------------------- */
body > .navbar-fixed .brand { body > .navbar-fixed .brand {
padding-right: 0; padding-right: 0;
@ -29,6 +29,12 @@ body > .navbar-fixed .brand:hover {
text-decoration: none; text-decoration: none;
} }
/* Space out sub-sections more
-------------------------------------------------- */
.page-header {
margin-top: 36px;
}
/* Jumbotrons /* Jumbotrons
-------------------------------------------------- */ -------------------------------------------------- */
.jumbotron { .jumbotron {
@ -92,12 +98,12 @@ body > .navbar-fixed .brand:hover {
color: #999; color: #999;
} }
/* Specific jumbotrons /* Specific jumbotrons
------------------------- */ ------------------------- */
/* supporting docs pages */ /* supporting docs pages */
.subhead { .subhead {
padding-bottom: 14px; padding-bottom: 14px;
margin-bottom: 45px;
border-bottom: 3px solid #e5e5e5; border-bottom: 3px solid #e5e5e5;
} }
.subhead h1, .subhead h1,
@ -224,46 +230,6 @@ body > .navbar-fixed .brand:hover {
} }
/* Topbar special styles
-------------------------------------------------- */
.topbar-wrapper {
position: relative;
height: 40px;
margin: 5px 0 15px;
}
.topbar-wrapper .topbar {
position: absolute;
margin: 0 -20px;
}
.topbar-wrapper .topbar .topbar-inner {
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
/* Topbar in js docs
------------------------- */
#bootstrap-js .topbar-wrapper {
z-index: 1;
}
#bootstrap-js .topbar-wrapper .topbar {
position: absolute;
margin: 0 -20px;
}
#bootstrap-js .topbar-wrapper .topbar .topbar-inner {
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
#bootstrap-js .topbar-wrapper .container {
width: auto;
}
/* Popover docs /* Popover docs
-------------------------------------------------- */ -------------------------------------------------- */
.popover-well { .popover-well {
@ -288,15 +254,13 @@ img.large-bird {
} }
/* Pretty Print /* Misc
-------------------------------------------------- */ -------------------------------------------------- */
pre.prettyprint { pre.prettyprint {
overflow: hidden; overflow: hidden;
} }
/* Wells
-------------------------------------------------- */
.well form { .well form {
margin-bottom: 0; margin-bottom: 0;
} }
@ -311,6 +275,7 @@ h2 + table {
margin-top: 5px; margin-top: 5px;
} }
/* Responsive Docs /* Responsive Docs
-------------------------------------------------- */ -------------------------------------------------- */
@media (max-width: 480px) { @media (max-width: 480px) {
@ -385,6 +350,7 @@ h2 + table {
} }
@media (min-width: 768px) and (max-width: 940px) { @media (min-width: 768px) and (max-width: 940px) {
/* Scale down the jumbotron content */ /* Scale down the jumbotron content */

View File

@ -197,7 +197,8 @@
<h2>Lists</h2> <h2>Lists</h2>
<div class="row"> <div class="row">
<div class="span3"> <div class="span3">
<h4>Unordered <code>&lt;ul&gt;</code></h4> <h4>Unordered</h4>
<p><code>&lt;ul&gt;</code></p>
<ul> <ul>
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
<li>Consectetur adipiscing elit</li> <li>Consectetur adipiscing elit</li>
@ -217,7 +218,8 @@
</ul> </ul>
</div> </div>
<div class="span3"> <div class="span3">
<h4>Unstyled <code>&lt;ul.unstyled&gt;</code></h4> <h4>Unstyled</h4>
<p><code>&lt;ul class="unstyled"&gt;</code></p>
<ul class="unstyled"> <ul class="unstyled">
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
<li>Consectetur adipiscing elit</li> <li>Consectetur adipiscing elit</li>
@ -237,7 +239,8 @@
</ul> </ul>
</div> </div>
<div class="span3"> <div class="span3">
<h4>Ordered <code>&lt;ol&gt;</code></h4> <h4>Ordered</h4>
<p><code>&lt;ol&gt;</code></p>
<ol> <ol>
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
<li>Consectetur adipiscing elit</li> <li>Consectetur adipiscing elit</li>
@ -250,7 +253,8 @@
</ol> </ol>
</div> </div>
<div class="span3"> <div class="span3">
<h4>Description <code>&lt;dl&gt;</code></h4> <h4>Description</h4>
<p><code>&lt;dl&gt;</code></p>
<dl> <dl>
<dt>Description lists</dt> <dt>Description lists</dt>
<dd>A description list is perfect for defining terms.</dd> <dd>A description list is perfect for defining terms.</dd>
@ -286,7 +290,7 @@
&lt;h1&gt;Heading&lt;/h1&gt; &lt;h1&gt;Heading&lt;/h1&gt;
&lt;p&gt;Something right here...&lt;/p&gt; &lt;p&gt;Something right here...&lt;/p&gt;
&lt;/div&gt;</pre> &lt;/div&gt;</pre>
<p><strong>Note:</strong> Be sure to keep code within <code>pre</code> tags as close to the left as possible; it will render all tabs.</p> <p><strong>Note:</strong> Be sure to keep code within <code>&lt;pre&gt;</code> tags as close to the left as possible; it will render all tabs.</p>
</td> </td>
</tr> </tr>
<tr> <tr>

View File

@ -548,7 +548,7 @@
<div class="row"> <div class="row">
<div class="span3"> <div class="span3">
<h2>Block messages</h2> <h2>Block messages</h2>
<p><code>.alert-message.block-message</code></p> <p><code>&lt;div class="alert-message block-message"&gt;</code></p>
<p>For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.</p> <p>For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.</p>
<p><a class="btn js-btn" href="./javascript.html#alerts">Get the javascript &raquo;</a></p> <p><a class="btn js-btn" href="./javascript.html#alerts">Get the javascript &raquo;</a></p>
</div> </div>

View File

@ -185,7 +185,7 @@
</tr> </tr>
<td>Javascript</td> <td>Javascript</td>
<td> <td>
<p><a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code>head</code>.</p> <p><a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code>&lt;head&gt;</code>.</p>
<pre class="prettyprint"> <pre class="prettyprint">
&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt; &lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
&lt;script src="/path/to/less.js"&gt;&lt;/script&gt; &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;

View File

@ -234,7 +234,7 @@
</div><!-- /col --> </div><!-- /col -->
<div class="span6"> <div class="span6">
<h2>Fluid layout</h2> <h2>Fluid layout</h2>
<p>An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.</p> <p><code>&lt;div class="fluid-container"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p>
<div class="mini-layout fluid"> <div class="mini-layout fluid">
<div class="mini-layout-sidebar"></div> <div class="mini-layout-sidebar"></div>
<div class="mini-layout-body"></div> <div class="mini-layout-body"></div>