From b4c894961c0b75361ead496f1686eb3cf41c5c97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:24:22 -0700 Subject: [PATCH] address issue #414 and fix up a number of docs loose ends --- docs/assets/css/docs.css | 58 +++++++++------------------------------- docs/base-css.html | 14 ++++++---- docs/components.html | 2 +- docs/less.html | 2 +- docs/scaffolding.html | 2 +- 5 files changed, 24 insertions(+), 54 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8ed81e713a..3a4dcff1c3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -15,7 +15,7 @@ body { background-repeat: repeat-x; } -/* Tweak topbar brand link to be super sleek +/* Tweak navbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { padding-right: 0; @@ -29,6 +29,12 @@ body > .navbar-fixed .brand:hover { text-decoration: none; } +/* Space out sub-sections more +-------------------------------------------------- */ +.page-header { + margin-top: 36px; +} + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -92,12 +98,12 @@ body > .navbar-fixed .brand:hover { color: #999; } - /* Specific jumbotrons ------------------------- */ /* supporting docs pages */ .subhead { padding-bottom: 14px; + margin-bottom: 45px; border-bottom: 3px solid #e5e5e5; } .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-well { @@ -288,15 +254,13 @@ img.large-bird { } -/* Pretty Print +/* Misc -------------------------------------------------- */ + pre.prettyprint { overflow: hidden; } - -/* Wells --------------------------------------------------- */ .well form { margin-bottom: 0; } @@ -311,6 +275,7 @@ h2 + table { margin-top: 5px; } + /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { @@ -385,6 +350,7 @@ h2 + table { } + @media (min-width: 768px) and (max-width: 940px) { /* Scale down the jumbotron content */ diff --git a/docs/base-css.html b/docs/base-css.html index e3b3782c0a..47dff40e72 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -197,7 +197,8 @@

Lists

-

Unordered <ul>

+

Unordered

+

<ul>

  • Lorem ipsum dolor sit amet
  • Consectetur adipiscing elit
    • @@ -217,7 +218,8 @@
-

Unstyled <ul.unstyled>

+

Unstyled

+

<ul class="unstyled">

  • Lorem ipsum dolor sit amet
  • Consectetur adipiscing elit
    • @@ -237,7 +239,8 @@
-

Ordered <ol>

+

Ordered

+

<ol>

  1. Lorem ipsum dolor sit amet
  2. Consectetur adipiscing elit
    3. @@ -250,7 +253,8 @@
-

Description <dl>

+

Description

+

<dl>

Description lists
A description list is perfect for defining terms.
@@ -286,7 +290,7 @@ <h1>Heading</h1> <p>Something right here...</p> </div> -

Note: Be sure to keep code within pre tags as close to the left as possible; it will render all tabs.

+

Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.

diff --git a/docs/components.html b/docs/components.html index 0e3f0a223f..59273ac195 100644 --- a/docs/components.html +++ b/docs/components.html @@ -548,7 +548,7 @@

Block messages

-

.alert-message.block-message

+

<div class="alert-message block-message">

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.

Get the javascript »

diff --git a/docs/less.html b/docs/less.html index 806c2eedec..d5a467bfa2 100644 --- a/docs/less.html +++ b/docs/less.html @@ -185,7 +185,7 @@ Javascript -

Download the latest Less.js and include the path to it (and Bootstrap) in the head.

+

Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

 <link rel="stylesheet/less" href="/path/to/bootstrap.less">
 <script src="/path/to/less.js"></script>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 9334e830c1..2a5ae8bc63 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -234,7 +234,7 @@

Fluid layout

-

An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.

+

<div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.