diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 4d0fd8fee2..b694f107ab 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -23,10 +23,6 @@ li { line-height: 20px; } -.bs-docs-container { - max-width: 780px; - margin: 0 auto; -} /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ @@ -67,6 +63,19 @@ hr.soften { border: 0; } +/* Table of contents */ +.bs-docs-content { + color: #999; +} +.bs-docs-contents ol { + margin-top: 5px; + margin-bottom: 0; +} +.bs-docs-contents li { + line-height: 25px; + color: #999; +} + /* Jumbotrons -------------------------------------------------- */ @@ -75,7 +84,7 @@ hr.soften { } .jumbotron h1 { margin-bottom: 9px; - font-size: 81px; + font-size: 80px; font-weight: bold; letter-spacing: -1px; line-height: 1; @@ -110,8 +119,6 @@ hr.soften { margin-bottom: 18px; } .masthead p { - margin-left: 5%; - margin-right: 5%; font-size: 30px; line-height: 36px; } @@ -290,10 +297,10 @@ hr.soften { .footer { padding: 35px 0 36px; margin-top: 45px; - text-align: center; border-top: 1px solid #e5e5e5; } .footer p { + margin-bottom: 5px; color: #555; } @@ -689,7 +696,7 @@ form.well { ------------------------- */ .bs-docs-grid { width: 940px; - margin-left: -80px; + margin-left: -240px; } @@ -908,7 +915,7 @@ form.well { .bs-docs-grid { width: 1170px; - margin-left: -195px; + margin-left: -300px; } } diff --git a/docs/base-css.html b/docs/base-css.html index 2afc8b5288..75bfced937 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -74,7 +74,7 @@ -
+
@@ -1592,10 +1592,10 @@ For example, <code>section</code> should be wrapped as inline.
diff --git a/docs/components.html b/docs/components.html index 72b86200f8..1e324bbfdf 100644 --- a/docs/components.html +++ b/docs/components.html @@ -74,7 +74,7 @@
-
+
@@ -1847,10 +1847,10 @@ class="clearfix"
diff --git a/docs/download.html b/docs/download.html index 9979ef26bf..a387c79217 100644 --- a/docs/download.html +++ b/docs/download.html @@ -74,7 +74,7 @@
-
+
@@ -421,10 +421,10 @@
diff --git a/docs/examples.html b/docs/examples.html index c70c4b00dc..5e8d74a3b5 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -74,7 +74,7 @@
-
+
@@ -112,10 +112,10 @@
diff --git a/docs/index.html b/docs/index.html index dbc5b99d0b..1d55aa23ad 100644 --- a/docs/index.html +++ b/docs/index.html @@ -74,7 +74,7 @@
-
+
@@ -187,10 +187,10 @@
diff --git a/docs/javascript.html b/docs/javascript.html index 7e604a37b9..f5276ccdd0 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -74,7 +74,7 @@
-
+
@@ -1508,10 +1508,10 @@ $('.carousel').carousel({
diff --git a/docs/less.html b/docs/less.html index 4a56f65a00..ad860bd4bd 100644 --- a/docs/less.html +++ b/docs/less.html @@ -74,7 +74,7 @@
-
+
@@ -1025,10 +1025,10 @@
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index cd80fc80ac..ffc55c3b99 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -74,7 +74,23 @@
-
+
+ +
+
+
+

Contents

+
    +
  1. Global styles
    2. +
  2. Grid system
    3. +
  3. Fluid grid system
    4. +
  4. Customizing
    5. +
  5. Layouts
    6. +
  6. Responsive design
    7. +
+
+
+
@@ -82,17 +98,6 @@

Scaffolding

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

-
-

Contents

- -
-
+

The default grid system provided in Bootstrap utilizes 12 columns that render out at widths of 724px, 940px (default without responsive CSS included), and 1170px. Below 767px viewports, the columns become fluid and stack vertically. 

 <div class="row">
   <div class="span4">...</div>
   <div class="span8">...</div>
 </div>
-
-
-

As shown here, a basic layout can be created with two "columns", each spanning a number of the 12 foundational columns we defined as part of our grid system.

-
-
+ +

As shown here, a basic layout can be created with two "columns", each spanning a number of the 12 foundational columns we defined as part of our grid system.


@@ -611,14 +609,16 @@ +
+
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 3e8448d194..ae2ce4aad0 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -86,7 +86,7 @@ -
+
{{>body}} @@ -94,10 +94,10 @@
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 3033c7b028..d2832e0fac 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -1,20 +1,25 @@ +
+
+
+

{{_i}}Contents{{/i}}

+
    +
  1. {{_i}}Global styles{{/i}}
    2. +
  2. {{_i}}Grid system{{/i}}
    3. +
  3. {{_i}}Fluid grid system{{/i}}
    4. +
  4. {{_i}}Customizing{{/i}}
    5. +
  5. {{_i}}Layouts{{/i}}
    6. +
  6. {{_i}}Responsive design{{/i}}
    7. +
+
+
+
+

{{_i}}Scaffolding{{/i}}

{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}

-
-

Contents

- -
-
+

{{_i}}The default grid system provided in Bootstrap utilizes 12 columns that render out at widths of 724px, 940px (default without responsive CSS included), and 1170px. Below 767px viewports, the columns become fluid and stack vertically. {{/i}}

 <div class="row">
   <div class="span4">...</div>
   <div class="span8">...</div>
 </div>
-
-
-

{{_i}}As shown here, a basic layout can be created with two "columns", each spanning a number of the 12 foundational columns we defined as part of our grid system.{{/i}}

-
-
+ +

{{_i}}As shown here, a basic layout can be created with two "columns", each spanning a number of the 12 foundational columns we defined as part of our grid system.{{/i}}


@@ -532,3 +530,6 @@ + +
+
\ No newline at end of file diff --git a/docs/upgrading.html b/docs/upgrading.html index a2da493ed0..2a2c398186 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -74,7 +74,7 @@ -
+
@@ -275,10 +275,10 @@