From: Mark Otto Date: Wed, 6 Jun 2012 07:48:31 +0000 (-0700) Subject: add back left rail nav, tweak colors X-Git-Tag: v2.1.0~2^2~303 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ecbd36cbf0cb8b2e894b2e36400e59a1c88eb1c;p=thirdparty%2Fbootstrap.git add back left rail nav, tweak colors --- diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 81fb7dc9be..2aeea9d24a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -10,18 +10,18 @@ -------------------------------------------------- */ body { position: relative; - padding-top: 90px; + padding-top: 60px; font-size: 14px; background-color: #fff; background-image: url(../img/grid-20px.png); background-repeat: repeat-x; - background-position: 0 40px; + background-position: 0 0; } /* Custom container for the narrow docs */ .bs-docs-container { max-width: 780px; - margin: 0 auto; + margin: 0 0 0 240px; } /* Increase docs base type size and line-heights */ @@ -36,6 +36,58 @@ li { } +.bs-docs-nav { + position: fixed; + top: 0; + left: 0; + bottom: 0; + overflow-y: scroll; + width: 140px; + padding: 25px 30px; + background-color: #555; + text-shadow: 0 1px 0 rgba(0,0,0,.25); + -webkit-box-shadow: inset -1px 0 0 rgba(0,0,0,.1); + -moz-box-shadow: inset -1px 0 0 rgba(0,0,0,.1); + box-shadow: inset -1px 0 0 rgba(0,0,0,.1); +} +.bs-docs-nav ul { + margin-left: 0; + margin-bottom: 15px; +} +.bs-docs-nav ul li { + list-style: none; + line-height: 1; +} +.bs-docs-nav ul li a { + display: block; + padding: 0 30px; + margin: 0 -30px; + font-size: 13px; + line-height: 24px; + color: #ccc; +} +.bs-docs-nav ul li a:hover { + color: #fff; + text-decoration: none; + background-color: #666; +} +.bs-docs-nav > ul > li > a { + font-size: 14px; + font-weight: bold; + color: #fff; +} +.bs-docs-logo { + font-size: 24px; + font-weight: bold; + line-height: 1; + margin-top: 0; + margin-bottom: 20px; +} +.bs-docs-logo a { + color: #353535; + text-shadow: 0 1px 0 #656565; +} + /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ @@ -114,12 +166,10 @@ hr.soften { /* Masthead (docs home) */ .masthead { - padding-top: 40px; margin-bottom: 60px; } .masthead h1, .masthead p { - text-align: center; } .masthead h1 { margin-bottom: 18px; @@ -248,9 +298,8 @@ hr.soften { .quick-links { min-height: 30px; margin: 0; - padding: 5px 20px; + padding: 5px 0; list-style: none; - text-align: center; overflow: hidden; } .quick-links:first-child { @@ -278,7 +327,6 @@ hr.soften { margin: 36px 0 27px; font-size: 40px; font-weight: 300; - text-align: center; } .marketing h2, .marketing h3 { @@ -299,7 +347,13 @@ hr.soften { float: left; margin: 4px 5px 0 0; } - +.marketing-byline { + margin: -18px 0 27px; + font-size: 18px; + font-weight: 300; + line-height: 24px; + color: #999; +} /* Footer @@ -307,10 +361,12 @@ hr.soften { .footer { padding: 35px 0 36px; margin-top: 45px; - text-align: center; border-top: 1px solid #e5e5e5; } .footer p { + font-size: 12px; + line-height: 20px; + margin-bottom: 0; color: #555; } @@ -535,14 +591,6 @@ h2 + .row { max-width: 100%; margin: 0 auto; } -.marketing-byline { - margin: -18px 0 27px; - font-size: 18px; - font-weight: 300; - line-height: 24px; - color: #999; - text-align: center; -} .scrollspy-example { height: 200px; diff --git a/docs/base-css.html b/docs/base-css.html index a1d8418bb1..a1c59bd811 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -27,51 +27,84 @@ - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -84,19 +117,6 @@ -
-
-

Contents

-
    -
  1. Typography
    2. -
  2. Code
    3. -
  3. Tables
    4. -
  4. Forms
    5. -
  5. Buttons
    6. -
  6. Icons by Glyphicons
    7. -
-
-
@@ -1626,10 +1646,10 @@ For example, <code>section</code> should be wrapped as inline.
diff --git a/docs/components.html b/docs/components.html index a82c8ac45a..f0856a19f4 100644 --- a/docs/components.html +++ b/docs/components.html @@ -27,51 +27,84 @@ - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -84,30 +117,6 @@ - -
-
-

Contents

-
    -
  1. Button groups
    2. -
  2. Button dropdowns
    3. -
  3. Nav, tabs, pills
    4. -
  4. Navbar
    5. -
  5. Breadcrumbs
    6. -
  6. Pagination
    7. -
  7. Labels
    8. -
  8. Badges
    9. -
  9. Type
    10. -
  10. Thumbnails
    11. -
  11. Alerts
    12. -
  12. Progress bars
    13. -
  13. Misc
    14. -
-
-
- - -
@@ -1843,10 +1852,10 @@ class="clearfix"
diff --git a/docs/download.html b/docs/download.html index c5fb07a5c8..654e7746db 100644 --- a/docs/download.html +++ b/docs/download.html @@ -27,51 +27,84 @@ - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -427,10 +460,10 @@
diff --git a/docs/examples.html b/docs/examples.html index c70c4b00dc..83d87426fb 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -27,51 +27,84 @@ - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -112,10 +145,10 @@
diff --git a/docs/index.html b/docs/index.html index dbc5b99d0b..aadff0641c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -27,51 +27,84 @@ - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -187,10 +220,10 @@
diff --git a/docs/javascript.html b/docs/javascript.html index 97c1272432..1afe4d2432 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -27,51 +27,84 @@ - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -85,28 +118,6 @@ -
-
-

Contents

-
    -
  1. All plugins
    2. -
  2. Modal
    3. -
  3. Dropdown
    4. -
  4. Scrollspy
    5. -
  5. Tab
    6. -
  6. Tooltip
    7. -
  7. Popover
    8. -
  8. Alert
    9. -
  9. Button
    10. -
  10. Collapse
    11. -
  11. Carousel
    12. -
  12. Typeahead
    13. -
-
-
- - -
@@ -1482,10 +1493,10 @@ $('.carousel').carousel({
diff --git a/docs/less.html b/docs/less.html index 76987cff52..30781a133c 100644 --- a/docs/less.html +++ b/docs/less.html @@ -27,51 +27,84 @@ - + - - -
-
-
- - Bootstrap -
- -
-
-
+
+ +
@@ -1014,10 +1047,10 @@
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index c93509ce49..870c18e8a9 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -27,51 +27,84 @@ - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -84,19 +117,6 @@ -
-

Contents

-
    -
  1. Global styles
    2. -
  2. Grid system
    3. -
  3. Fluid grid system
    4. -
  4. Customizing
    5. -
  5. Layouts
    6. -
  6. Responsive design
    7. -
-
- - @@ -578,10 +598,10 @@
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 3e8448d194..1d23c83703 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -39,51 +39,84 @@ {{/production}} - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -94,10 +127,10 @@
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 595f4b5a9c..a6cea57507 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -6,19 +6,6 @@ -
-
-

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

-
    -
  1. {{_i}}Typography{{/i}}
    2. -
  2. {{_i}}Code{{/i}}
    3. -
  3. {{_i}}Tables{{/i}}
    4. -
  4. {{_i}}Forms{{/i}}
    5. -
  5. {{_i}}Buttons{{/i}}
    6. -
  6. {{_i}}Icons by Glyphicons{{/i}}
    7. -
-
-
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 6430572549..d05eacf534 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -6,30 +6,6 @@ - -
-
-

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

-
    -
  1. {{_i}}Button groups{{/i}}
    2. -
  2. {{_i}}Button dropdowns{{/i}}
    3. -
  3. {{_i}}Nav, tabs, pills{{/i}}
    4. -
  4. {{_i}}Navbar{{/i}}
    5. -
  5. {{_i}}Breadcrumbs{{/i}}
    6. -
  6. {{_i}}Pagination{{/i}}
    7. -
  7. {{_i}}Labels{{/i}}
    8. -
  8. {{_i}}Badges{{/i}}
    9. -
  9. {{_i}}Type{{/i}}
    10. -
  10. {{_i}}Thumbnails{{/i}}
    11. -
  11. {{_i}}Alerts{{/i}}
    12. -
  12. {{_i}}Progress bars{{/i}}
    13. -
  13. {{_i}}Misc{{/i}}
    14. -
-
-
- - -
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 2153edc3d2..30872b1e1a 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -7,28 +7,6 @@ -
-
-

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

-
    -
  1. {{_i}}All plugins{{/i}}
    2. -
  2. {{_i}}Modal{{/i}}
    3. -
  3. {{_i}}Dropdown{{/i}}
    4. -
  4. {{_i}}Scrollspy{{/i}}
    5. -
  5. {{_i}}Tab{{/i}}
    6. -
  6. {{_i}}Tooltip{{/i}}
    7. -
  7. {{_i}}Popover{{/i}}
    8. -
  8. {{_i}}Alert{{/i}}
    9. -
  9. {{_i}}Button{{/i}}
    10. -
  10. {{_i}}Collapse{{/i}}
    11. -
  11. {{_i}}Carousel{{/i}}
    12. -
  12. {{_i}}Typeahead{{/i}}
    13. -
-
-
- - -
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index abf98da77c..ee447da3d3 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -6,19 +6,6 @@ -
-

{{_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. -
-
- - diff --git a/docs/upgrading.html b/docs/upgrading.html index a2da493ed0..85d8f9ef0e 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -27,51 +27,84 @@ - - - - -
-
-
- - Bootstrap -
- -
-
-
+ + +
+ +
@@ -275,10 +308,10 @@