From 475b985a0efaf534b56089f12c570d7861ce72f5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 16:37:43 -0800 Subject: remove padding from first-child of inline radios/checkboxes --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e928bb6d1..1b572090c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -596,6 +596,9 @@ input[type="hidden"] { .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; } +.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { + padding-top: 5px; +} input, textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -- cgit v1.2.3 From 06df91ac559686e947c3c1fbfbdd2b7dcfc5a56b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 16:48:03 -0800 Subject: remove background from accordion, and use border instead --- docs/assets/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1b572090c..bf1116f53 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3165,7 +3165,8 @@ a.thumbnail:hover { margin-bottom: 18px; } .accordion-group { - background-color: #f5f5f5; + margin-bottom: 2px; + border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3177,9 +3178,6 @@ a.thumbnail:hover { display: block; padding: 8px 15px; } -.accordion-body { - margin-bottom: 2px; -} .accordion-inner { padding: 9px 15px; border-top: 1px solid #e5e5e5; -- cgit v1.2.3 From 4fa931e403ec3ae2f8f7f690c6c4040365f68ba9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:11:31 -0800 Subject: fix the navbar click and a few jank responsive problems --- docs/assets/css/bootstrap-responsive.css | 142 ++++++++++++++++++------------- docs/assets/css/bootstrap.css | 4 +- docs/assets/css/docs.css | 23 ++++- docs/base-css.html | 2 +- docs/components.html | 81 ++++++++++-------- docs/templates/pages/base-css.mustache | 2 +- docs/templates/pages/components.mustache | 81 ++++++++++-------- 7 files changed, 195 insertions(+), 140 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 631c904e7..b0fbd9d7b 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -175,22 +175,23 @@ margin-bottom: 36px; } .navbar-inner { - padding: 10px; + padding: 5px; background-image: none; } .navbar .container { padding: 0; } .navbar .brand { - float: none; - display: block; - padding-left: 15px; - padding-right: 15px; - margin: 0; + padding-left: 10px; + padding-right: 10px; + margin: 0 0 0 -5px; + } + .navbar .nav-collapse { + clear: left; } .navbar .nav { float: none; - margin: 9px 0; + margin: 0 0 9px; } .navbar .nav > li { float: none; @@ -217,8 +218,10 @@ } .navbar .dropdown-menu { position: static; - display: block; + top: auto; + left: auto; float: none; + display: block; max-width: none; margin: 0 15px; padding: 0; @@ -263,60 +266,83 @@ height: 0; } } -/* @media (min-width: 1210px) { - - // Reset grid variables - @gridColumns: 12; - @gridColumnWidth: 70px; - @gridGutterWidth: 30px; - @siteWidth: 1170px; - - // Bring grid mixins to recalculate widths - .columns(@columns: 1) { - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); - } - .offset(@columns: 1) { - margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); - } - .container { - width: @siteWidth; + width: 1170px; } .row { - margin-left: @gridGutterWidth * -1; + margin-left: -30px; } [class*="span"] { - margin-left: @gridGutterWidth; - } - - // Default columns - .span1 { .columns(1); } - .span2 { .columns(2); } - .span3 { .columns(3); } - .span4 { .columns(4); } - .span5 { .columns(5); } - .span6 { .columns(6); } - .span7 { .columns(7); } - .span8 { .columns(8); } - .span9 { .columns(9); } - .span10 { .columns(10); } - .span11 { .columns(11); } - .span12 { .columns(12); } - - // Offset column options - .offset1 { .offset(1); } - .offset2 { .offset(2); } - .offset3 { .offset(3); } - .offset4 { .offset(4); } - .offset5 { .offset(5); } - .offset6 { .offset(6); } - .offset7 { .offset(7); } - .offset8 { .offset(8); } - .offset9 { .offset(9); } - .offset10 { .offset(10); } - .offset11 { .offset(11); } - .offset12 { .offset(12); } - + margin-left: 30px; + } + .span1 { + width: 70px; + } + .span2 { + width: 170px; + } + .span3 { + width: 270px; + } + .span4 { + width: 370px; + } + .span5 { + width: 470px; + } + .span6 { + width: 570px; + } + .span7 { + width: 670px; + } + .span8 { + width: 770px; + } + .span9 { + width: 870px; + } + .span10 { + width: 970px; + } + .span11 { + width: 1070px; + } + .span12 { + width: 1170px; + } + .offset1 { + margin-left: 130px; + } + .offset2 { + margin-left: 230px; + } + .offset3 { + margin-left: 330px; + } + .offset4 { + margin-left: 430px; + } + .offset5 { + margin-left: 530px; + } + .offset6 { + margin-left: 630px; + } + .offset7 { + margin-left: 730px; + } + .offset8 { + margin-left: 830px; + } + .offset9 { + margin-left: 930px; + } + .offset10 { + margin-left: 1030px; + } + .offset11 { + margin-left: 1130px; + } } -*/ \ No newline at end of file diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bf1116f53..6916e9361 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2315,8 +2315,8 @@ button.btn.small, input[type="submit"].btn.small { display: none; float: right; padding: 7px 10px; - margin-left: 10px; - margin-right: 10px; + margin-left: 5px; + margin-right: 5px; background-color: #2c2c2c; background-image: -moz-linear-gradient(top, #333333, #222222); background-image: -ms-linear-gradient(top, #333333, #222222); diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b06065365..cc7ca0c63 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -522,6 +522,7 @@ h2 + .row { /* Example sites showcase */ .example-sites img { max-width: 100%; + margin: 0 auto; } .marketing-byline { margin: -18px 0 27px; @@ -646,6 +647,10 @@ form.well { padding: 10px 14px; margin: 0 auto 10px; } + /* Masthead (home page jumbotron) */ + .masthead { + padding-top: 0; + } /* Don't space out quick links so much */ .quick-links { @@ -669,8 +674,9 @@ form.well { display: block; max-width: 300px; margin: 0 auto 18px; + text-align: center; } - .example-sites img { + .example-sites .thumbnail > img { max-width: 270px; } @@ -796,11 +802,20 @@ form.well { /* Unfloat brand */ .navbar-fixed-top .brand { - float: none; + float: left; margin-left: 0; - padding-left: 15px; - padding-right: 15px; + padding-left: 10px; + padding-right: 10px; } } +/* LARGE DESKTOP SCREENS */ +@media (min-width: 1210px) { + + /* Update subnav container */ + .subnav-fixed .nav { + width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */ + } + +} diff --git a/docs/base-css.html b/docs/base-css.html index c68391261..4651e9789 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1497,7 +1497,7 @@ For example, <code>section</code> should be wrapped as inline.
- +
diff --git a/docs/components.html b/docs/components.html index a2fac7360..950d1f35c 100644 --- a/docs/components.html +++ b/docs/components.html @@ -662,40 +662,47 @@
+ + + + + Project name - -
- -
- +
+ +
+ +
+ +
@@ -733,7 +740,7 @@ <input type="text" class="search-query pull-left" placeholder="Search"> </form> - +

Nav links

Nav items are simple to add via unordered lists.

@@ -763,9 +770,9 @@ </li> </ul> -

Get the javascript →

-
- +

Get the javascript →

+ + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 6cbb111ac..c15fcebd3 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1425,7 +1425,7 @@
- +
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 363ed1ba1..3a92953ae 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -590,40 +590,47 @@
+ + + + + {{_i}}Project name{{/i}} - -
- -
- +
+ +
+ +
+ +
@@ -661,7 +668,7 @@ <input type="text" class="search-query pull-left" placeholder="{{_i}}Search{{/i}}"> </form> - +

{{_i}}Nav links{{/i}}

{{_i}}Nav items are simple to add via unordered lists.{{/i}}

@@ -691,9 +698,9 @@ </li> </ul> -

{{_i}}Get the javascript →{{/i}}

-
- +

{{_i}}Get the javascript →{{/i}}

+ + -- cgit v1.2.3 From e532228721734492d6f2741f729525cc1bb3c77c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:25:05 -0800 Subject: more responsive tweaks for tablet --- docs/assets/css/bootstrap-responsive.css | 55 +++++++++++++++----------------- 1 file changed, 26 insertions(+), 29 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index b0fbd9d7b..bbfc0ac5a 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -89,81 +89,78 @@ } @media (min-width: 768px) and (max-width: 940px) { .container { - width: 748px; - padding-left: 10px; - padding-right: 10px; + width: 724px; + padding-left: 20px; + padding-right: 20px; } .span1 { - width: 44px; + width: 42px; } .span2 { - width: 108px; + width: 104px; } .span3 { - width: 172px; + width: 166px; } .span4 { - width: 236px; + width: 228px; } .span5 { - width: 300px; + width: 290px; } .span6 { - width: 364px; + width: 352px; } .span7 { - width: 428px; + width: 414px; } .span8 { - width: 492px; + width: 476px; } .span9 { - width: 556px; + width: 538px; } .span10 { - width: 620px; + width: 600px; } .span11 { - width: 684px; + width: 662px; } .span12 { - width: 748px; + width: 724px; } .offset1 { - margin-left: 84px; + margin-left: 82px; } .offset2 { - margin-left: 148px; + margin-left: 144px; } .offset3 { - margin-left: 212px; + margin-left: 206px; } .offset4 { - margin-left: 276px; + margin-left: 268px; } .offset5 { - margin-left: 340px; + margin-left: 330px; } .offset6 { - margin-left: 404px; + margin-left: 392px; } .offset7 { - margin-left: 468px; + margin-left: 454px; } .offset8 { - margin-left: 532px; + margin-left: 516px; } .offset9 { - margin-left: 596px; + margin-left: 578px; } .offset10 { - margin-left: 660px; + margin-left: 640px; } .offset11 { - margin-left: 724px; - } - .offset12 { - margin-left: 788px; + margin-left: 702px; } } @media (max-width: 940px) { -- cgit v1.2.3 From e17c9249d2bef78355711ce305e1a8d36bd75c3e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:27:09 -0800 Subject: fix dropdowns in subnav --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index cc7ca0c63..430191a6f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -732,7 +732,7 @@ form.well { .subnav .nav > li > a { border: 0; } - .subnav .nav > li + li a { + .subnav .nav > li + li > a { border-top: 1px solid #e5e5e5; } -- cgit v1.2.3 From 99ac6ca08ed27126d2ad1dd4d0e820205aab9c48 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:39:36 -0800 Subject: update components page to include docs for the new navbar collapse feature, re-add responsive.less to downloader --- docs/components.html | 29 ++++++++++++++++++++++++++++- docs/download.html | 6 +----- docs/templates/pages/components.mustache | 29 ++++++++++++++++++++++++++++- docs/templates/pages/download.mustache | 6 +----- 4 files changed, 58 insertions(+), 12 deletions(-) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index 950d1f35c..710e7de77 100644 --- a/docs/components.html +++ b/docs/components.html @@ -467,7 +467,7 @@
  • List header
    • -
  • Home
    • +
  • Home
  • Library
  • Applications
  • Another list header
    • @@ -740,6 +740,33 @@ <input type="text" class="search-query pull-left" placeholder="Search"> </form> +

    Optional responsive variation

    +

    Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse, and add the navbar toggle button, .btn-navbar.

    +
    +<div class="navbar navbar-static">
+  <div class="navbar-inner">
+    <div class="container">
+      
+      <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
+      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+        <span class="i-bar"></span>
+        <span class="i-bar"></span>
+        <span class="i-bar"></span>
+      </a>
+      
+      <!-- Be sure to leave the brand out there if you want it shown -->
+      <a class="brand" href="#">Project name</a>
+
+      <!-- Everything you want hidden at 940px or less, place within here -->
+      <div class="nav-collapse">
+        <!-- .nav, .navbar-search, .navbar-form, etc -->
+      </div>
+
+    </div>
+  </div>
+</div>
+
    +

Nav links

diff --git a/docs/download.html b/docs/download.html index 5bcce7ced..832b07ce6 100644 --- a/docs/download.html +++ b/docs/download.html @@ -135,12 +135,8 @@ - +
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 3a92953ae..5c91431fa 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -395,7 +395,7 @@
  • {{_i}}List header{{/i}}
    • -
  • {{_i}}Home{{/i}}
    • +
  • {{_i}}Home{{/i}}
  • {{_i}}Library{{/i}}
  • {{_i}}Applications{{/i}}
  • {{_i}}Another list header{{/i}}
    • @@ -668,6 +668,33 @@ <input type="text" class="search-query pull-left" placeholder="{{_i}}Search{{/i}}"> </form> +

    {{_i}}Optional responsive variation{{/i}}

    +

    {{_i}}Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse, and add the navbar toggle button, .btn-navbar.{{/i}}

    +
    +<div class="navbar navbar-static">
+  <div class="navbar-inner">
+    <div class="container">
+      
+      <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
+      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+        <span class="i-bar"></span>
+        <span class="i-bar"></span>
+        <span class="i-bar"></span>
+      </a>
+      
+      <!-- Be sure to leave the brand out there if you want it shown -->
+      <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
+
+      <!-- Everything you want hidden at 940px or less, place within here -->
+      <div class="nav-collapse">
+        <!-- .nav, .navbar-search, .navbar-form, etc -->
+      </div>
+
+    </div>
+  </div>
+</div>
+
    +

{{_i}}Nav links{{/i}}

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index dccc5fbb6..34f8130ac 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -63,12 +63,8 @@ - +
-- cgit v1.2.3 From cf1b46bda4853e8501c2b9587219535376a9cc36 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:46:41 -0800 Subject: fix alert close position --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6916e9361..43ef8547f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2002,6 +2002,7 @@ button.btn.small, input[type="submit"].btn.small { } .alert .close { position: relative; + top: -2px; right: -21px; line-height: 18px; } -- cgit v1.2.3 From 3e462f1fb27b3ca97135948dc74ccef55336c8bb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 20:26:27 -0800 Subject: update docs to simplify some css --- docs/assets/css/docs.css | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 430191a6f..f36fa76d6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -106,35 +106,6 @@ hr.soften { } -/* Benefits list in masthead */ -.benefits { - display: none; - width: 260px; - position: absolute; - right: 0; - bottom: 0; -} -.benefits ul { - list-style: none; - margin: 0; -} -.benefits li { - font-size: 16px; - font-weight: 300; - line-height: 35px; - color: #555; -} -.benefits li + li { - border-top: 1px solid #f5f5f5; -} -.benefits h4 { - color: #555; -} -.benefits span { - padding-right: 5px; - color: #999; -} - /* Specific jumbotrons ------------------------- */ /* supporting docs pages */ @@ -175,7 +146,6 @@ hr.soften { margin: 0; padding-top: 11px; padding-bottom: 11px; - font-size: 13px; border-left: 1px solid #f5f5f5; border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; -- cgit v1.2.3 From 5f314dcb85b011d30bbe845e00932a9a550d4e71 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 20:27:18 -0800 Subject: remove benefits from homepage html --- docs/index.html | 12 ------------ docs/templates/pages/index.mustache | 12 ------------ 2 files changed, 24 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 89f5accd6..69972c843 100644 --- a/docs/index.html +++ b/docs/index.html @@ -82,18 +82,6 @@ View project on GitHub Download Bootstrap

-
-

Feature highlights

-
    -
  • ✔ Built on LESS
    • -
  • ✔ Complete style guide docs
    • -
  • ✔ Fully responsive design
    • -
  • ✔ Small footprint (10kb gzipped)
    • -
  • ✔ Support for IE7 and up
    • -
  • ✔ Custom jQuery plugins
    • -
  • ✔ Dozens of components
    • -
-
    diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 5fa70645a..4ae3b7a6f 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -10,18 +10,6 @@ {{_i}}View project on GitHub{{/i}} {{_i}}Download Bootstrap{{/i}}

    -
    -

    {{_i}}Feature highlights{{/i}}

    -
      -
    • ✔ {{_i}}Built on LESS{{/i}}
      • -
    • ✔ {{_i}}Complete style guide docs{{/i}}
      • -
    • ✔ {{_i}}Fully responsive design{{/i}}
      • -
    • ✔ {{_i}}Small footprint (10kb gzipped){{/i}}
      • -
    • ✔ {{_i}}Support for IE7 and up{{/i}}
      • -
    • ✔ {{_i}}Custom jQuery plugins{{/i}}
      • -
    • ✔ {{_i}}Dozens of components{{/i}}
      • -
    -
      -- cgit v1.2.3 From f1e520badd51d01ebcd33758966ef868e5cdd1c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 20:34:07 -0800 Subject: clarify and tweak media queries --- docs/assets/css/bootstrap-responsive.css | 2 +- docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index bbfc0ac5a..f40f0c110 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -263,7 +263,7 @@ height: 0; } } -@media (min-width: 1210px) { +@media (min-width: 1200px) { .container { width: 1170px; } diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 14da044bb..184b35608 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -390,7 +390,7 @@ @media (min-width: 768px) and (max-width: 940px) { ... } // Large desktop - @media (min-width: 1210px) { .. } + @media (min-width: 1200px) { .. } diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index cf672cc6e..6d5a66f8d 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -318,7 +318,7 @@ @media (min-width: 768px) and (max-width: 940px) { ... } // {{_i}}Large desktop{{/i}} - @media (min-width: 1210px) { .. } + @media (min-width: 1200px) { .. } -- cgit v1.2.3 From 59d9983ebcc889b5e5626d672311e92657bfe3e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 22:03:14 -0800 Subject: updates to responsive and docs for responsive navbar --- docs/assets/css/bootstrap.css | 3 +++ docs/assets/css/docs.css | 7 ++----- docs/components.html | 3 +++ docs/templates/pages/components.mustache | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 43ef8547f..e09e58a82 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2359,6 +2359,9 @@ button.btn.small, input[type="submit"].btn.small { .btn-navbar .i-bar + .i-bar { margin-top: 3px; } +.nav-collapse.collapse { + height: auto !important; +} .navbar .brand:hover { text-decoration: none; } diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f36fa76d6..7876f300a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -671,11 +671,6 @@ form.well { } } -@media (min-width: 940px) { - .nav-collapse.collapse { - height: auto !important; - } -} @media (max-width: 768px) { @@ -768,6 +763,7 @@ form.well { } + @media (max-width: 940px) { /* Unfloat brand */ @@ -780,6 +776,7 @@ form.well { } + /* LARGE DESKTOP SCREENS */ @media (min-width: 1210px) { diff --git a/docs/components.html b/docs/components.html index 710e7de77..f9f8db057 100644 --- a/docs/components.html +++ b/docs/components.html @@ -766,6 +766,9 @@ </div> </div> +
      + Heads up! The responsive navbar requires the collapse plugin. +
      diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 5c91431fa..5cb914e32 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -694,6 +694,9 @@ </div> </div> +
      + {{_i}}Heads up!{{/i}} The responsive navbar requires the collapse plugin. +
      -- cgit v1.2.3 From 487dbfdda4692e3212f13d5e6282d7818b4c9934 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 22:14:51 -0800 Subject: namespace progress bars and labels classes --- docs/assets/css/bootstrap.css | 20 +++++++-------- docs/components.html | 42 +++++++++++++++----------------- docs/templates/pages/components.mustache | 42 +++++++++++++++----------------- 3 files changed, 48 insertions(+), 56 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e09e58a82..a17a4475d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3003,16 +3003,16 @@ a.thumbnail:hover { -moz-border-radius: 3px; border-radius: 3px; } -.label.important { +.label-important { background-color: #b94a48; } -.label.warning { +.label-warning { background-color: #f89406; } -.label.success { +.label-success { background-color: #468847; } -.label.info { +.label-info { background-color: #3a87ad; } @-webkit-keyframes progress-bar-stripes { @@ -3105,7 +3105,7 @@ a.thumbnail:hover { -moz-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress.danger .bar { +.progress-danger .bar { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); @@ -3116,7 +3116,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); } -.progress.danger.striped .bar { +.progress-danger.progress-striped .bar { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -3125,7 +3125,7 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress.success .bar { +.progress-success .bar { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); @@ -3136,7 +3136,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); } -.progress.success.striped .bar { +.progress-success.progress-striped .bar { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -3145,7 +3145,7 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress.info .bar { +.progress-info .bar { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); @@ -3156,7 +3156,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); } -.progress.info.striped .bar { +.progress-info.progress-striped .bar { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); diff --git a/docs/components.html b/docs/components.html index f9f8db057..52483572e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1007,34 +1007,34 @@ - New + New - <span class="label success">New</span> + <span class="label label-success">New</span> - Warning + Warning - <span class="label warning">Warning</span> + <span class="label label-warning">Warning</span> - Important + Important - <span class="label important">Important</span> + <span class="label label-important">Important</span> - Info + Info - <span class="label info">Info</span> + <span class="label label-info">Info</span> @@ -1307,12 +1307,12 @@

      Striped

      Uses a gradient to create a striped effect.

      -
      + 
      -<div class="progress info
-     striped">
+<div class="progress progress-info
+     progress-striped">
   <div class="bar"
        style="width: 20%;"></div>
 </div>
@@ -1321,12 +1321,12 @@
     
      
       
      Animated
      
       
      Takes the striped example and animates it.
      
-      
      
+      
      
         
      
       
      
 
      -<div class="progress danger
-     striped active">
+<div class="progress progress-danger
+     progress-striped active">
   <div class="bar"
        style="width: 40%;"></div>
 </div>
@@ -1338,18 +1338,18 @@
   
      
     
      
       
      Additional colors
      
-      
      Progress bars utilize some of the same classes as buttons and alert messages for quick styling.
      
+      
      Progress bars utilize some of the same class names as buttons and alerts for similar styling.
      
       
        
-        
      • .info
        • 
-        
      • .success
        • 
-        
      • .danger
        • 
+        
      • .progress-info
        • 
+        
      • .progress-success
        • 
+        
      • .progress-danger
        • 
       
      
       
      Alternatively, you can customize the LESS files and roll your own colors and sizes.
      
     
      
     
      
       
      Behavior
      
       
      Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.
      
-      
      If you use the .active class, your .striped progress bars will animate the stripes left to right.
      
+      
      If you use the .active class, your .progress-striped progress bars will animate the stripes left to right.
      
     
      
     
      
       
      Browser support
      
@@ -1398,10 +1398,6 @@
 
 
 
-
-
-
-
      
       
      
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 5cb914e32..312863c6b 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -935,34 +935,34 @@
       
       
         
-          {{_i}}New{{/i}}
+          {{_i}}New{{/i}}
         
         
-          <span class="label success">{{/_i}}New{{/i}}</span>
+          <span class="label label-success">{{/_i}}New{{/i}}</span>
         
       
       
         
-          {{_i}}Warning{{/i}}
+          {{_i}}Warning{{/i}}
         
         
-          <span class="label warning">{{_i}}Warning{{/i}}</span>
+          <span class="label label-warning">{{_i}}Warning{{/i}}</span>
         
       
       
         
-          {{_i}}Important{{/i}}
+          {{_i}}Important{{/i}}
         
         
-          <span class="label important">{{_i}}Important{{/i}}</span>
+          <span class="label label-important">{{_i}}Important{{/i}}</span>
         
       
       
         
-          {{_i}}Info{{/i}}
+          {{_i}}Info{{/i}}
         
         
-          <span class="label info">{{_i}}Info{{/i}}</span>
+          <span class="label label-info">{{_i}}Info{{/i}}</span>
         
       
     
@@ -1235,12 +1235,12 @@
     
      
       
      {{_i}}Striped{{/i}}
      
       
      {{_i}}Uses a gradient to create a striped effect.{{/i}}
      
-      
      
+      
      
         
      
       
      
 
      -<div class="progress info
-     striped">
+<div class="progress progress-info
+     progress-striped">
   <div class="bar"
        style="width: 20%;"></div>
 </div>
@@ -1249,12 +1249,12 @@
     
      
       
      {{_i}}Animated{{/i}}
      
       
      {{_i}}Takes the striped example and animates it.{{/i}}
      
-      
      
+      
      
         
      
       
      
 
      -<div class="progress danger
-     striped active">
+<div class="progress progress-danger
+     progress-striped active">
   <div class="bar"
        style="width: 40%;"></div>
 </div>
@@ -1266,18 +1266,18 @@
   
      
     
      
       
      {{_i}}Additional colors{{/i}}
      
-      
      {{_i}}Progress bars utilize some of the same classes as buttons and alert messages for quick styling.{{/i}}
      
+      
      {{_i}}Progress bars utilize some of the same class names as buttons and alerts for similar styling.{{/i}}
      
       
        
-        
      • .info
        • 
-        
      • .success
        • 
-        
      • .danger
        • 
+        
      • .progress-info
        • 
+        
      • .progress-success
        • 
+        
      • .progress-danger
        • 
       
      
       
      {{_i}}Alternatively, you can customize the LESS files and roll your own colors and sizes.{{/i}}
      
     
      
     
      
       
      {{_i}}Behavior{{/i}}
      
       
      {{_i}}Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.{{/i}}
      
-      
      {{_i}}If you use the .active class, your .striped progress bars will animate the stripes left to right.{{/i}}
      
+      
      {{_i}}If you use the .active class, your .progress-striped progress bars will animate the stripes left to right.{{/i}}
      
     
      
     
      
       
      {{_i}}Browser support{{/i}}
      
@@ -1324,7 +1324,3 @@
     
      
   
      
 
-
-
-
-
-- 
cgit v1.2.3


From 62f4a1571a3801c867b80c228464cc9c695f1d13 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 28 Jan 2012 22:48:25 -0800
Subject: revamped the thumbnails examples to make them work and look better at
 higher resolution

---
 docs/assets/css/bootstrap-responsive.css |  6 ++++++
 docs/assets/css/bootstrap.css            |  2 ++
 docs/components.html                     | 28 ++++++++++++++--------------
 docs/templates/pages/components.mustache | 28 ++++++++++++++--------------
 4 files changed, 36 insertions(+), 28 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index f40f0c110..ca03cecde 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -342,4 +342,10 @@
   .offset11 {
     margin-left: 1130px;
   }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
 }
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index a17a4475d..37b774fb9 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2988,6 +2988,8 @@ a.thumbnail:hover {
 .thumbnail > img {
   display: block;
   max-width: 100%;
+  margin-left: auto;
+  margin-right: auto;
 }
 .thumbnail .caption {
   padding: 9px;
diff --git a/docs/components.html b/docs/components.html
index 52483572e..7ba72f34d 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1057,22 +1057,22 @@
       
@@ -1083,7 +1083,7 @@
       
        
         
      • 
           
        
-            
+            
             
        
               
        Thumbnail label
        
               
        Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
        
@@ -1093,7 +1093,7 @@
         
        • 
         
      • 
           
        
-            
+            
             
        
               
        Thumbnail label
        
               
        Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
        
@@ -1128,7 +1128,7 @@
 <ul class="thumbnails">
   <li class="span3">
     <a href="#" class="thumbnail">
-      <img src="http://placehold.it/210x150" alt="">
+      <img src="http://placehold.it/260x180" alt="">
     </a>
   </li>
   ...
@@ -1139,7 +1139,7 @@
 <ul class="thumbnails">
   <li class="span3">
     <div class="thumbnail">
-      <img src="http://placehold.it/210x150" alt="">
+      <img src="http://placehold.it/260x180" alt="">
       <h5>Thumbnail label</h5>
       <p>Thumbnail caption right here...</p>
     </div>
@@ -1154,32 +1154,32 @@
       
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 312863c6b..11874b9f3 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -985,22 +985,22 @@
       
@@ -1011,7 +1011,7 @@
       
+  
        {{_i}}Navbar (formerly topbar){{/i}}
        
+          
   
        {{_i}}Dropdown menus{{/i}}
        
   
          
     
        • {{_i}}Updated the .dropdown-menu to tighten up spacing{{/i}}
          • 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index c0778d9d0..d7ad30f56 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -186,6 +186,15 @@
     
        • Pills were restyled to be less rounded by default
          • 
     
        • Pills now have dropdown menu support (they share the same markup and styles as tabs)
          • 
   
        
+  
        Navbar (formerly topbar)
        
+  
          
+    
        • Base class changed from .topbar to .navbar
          • 
+    
        • Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed)
          • 
+    
        • Added vertical dividers to top-level nav
          • 
+    
        • Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.
          • 
+    
        • Navbar search form now requires use of the .navbar-search class and its input the use of .search-query. To position the search form, you must use .pull-left or .pull-right.
          • 
+    
        • Added optional responsive markup for collapsing navbar contents for smaller resolutions and devices. See navbar docs for how to utilize.
          • 
+  
        
   
        Dropdown menus
        
   
          
     
        • Updated the .dropdown-menu to tighten up spacing
          • 
-- 
cgit v1.2.3


From 15a1c0ce7988aaf715096760fa99eff7b23937f4 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 28 Jan 2012 23:58:39 -0800
Subject: add swatches to the color variables in less docs page

---
 docs/assets/css/docs.css           |  24 +++++
 docs/less.html                     | 202 +++++++++++++++++--------------------
 docs/templates/pages/less.mustache | 202 +++++++++++++++++--------------------
 3 files changed, 204 insertions(+), 224 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 7876f300a..9b8244d49 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -470,6 +470,30 @@ hr.soften {
 
 
 
+/* Color swatches on LESS docs page
+-------------------------------------------------- */
+/* Sets the width of the td */
+.swatch-col {
+  width: 30px;
+}
+/* Le swatch */
+.swatch {
+  display: inline-block;
+  width: 30px;
+  height: 20px;
+  margin: -6px 0;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+/* For white swatches, give a border */
+.swatch-bordered {
+  width: 28px;
+  height: 18px;
+  border: 1px solid #eee;
+}
+
+
 /* Misc
 -------------------------------------------------- */
 
diff --git a/docs/less.html b/docs/less.html
index 497a9dfe3..5935c9125 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -134,168 +134,146 @@
 ================================================== -->
 
          
   
          
-    
          Bootstrap variables 
          
+    
          Bootstrap variables LESS variables, their values, and usage guidelines
          
   
          
 
-  
          Hyperlinks
          
-  
-    
-      
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-      
-      
-        
-        
-        
-      
-    
-  
          VariableValueUsage
          @linkColor#08cDefault link text color
          @linkColorHoverdarken(@linkColor, 15%)Default link text hover color
          
-
   
          
     
          
-      
          Grayscale colors
          
+      
          Hyperlinks
          
       
-        
+        
-            
-            
+            
+            
+            
+            
-        
+          
+            
+            
+            
+            
+          
+        
+      
          
           
          VariableValue@linkColor#08cDefault link text color
           
          @linkColorHoverdarken(@linkColor, 15%)Default link text hover color
          
+      
          Grid system
          
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
          @gridColumns12
          @gridColumnWidth60px
          @gridGutterWidth20px
          @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
          
+      
          Typography
          
+      
+        
+          
+            
+            
+          
+          
+            
+            
+            
+          
+          
+            
+            
+          
+        
+      
          @baseFontSize13px
          @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
          @baseLineHeight18px
          
+    
          
+    
          
+      
          Grayscale colors
          
+      
-            
+            
+            
+            
+            
+            
+            
+            
+            
          
         
           
          @black@black
             #000
           
          
           
          
             @grayDarker
             #222
           
          
           
          
             @grayDark
             #333
           
          
           
          
             @gray
             #555
           
          
           
          
             @grayLight
             #999
           
          
           
          
             @grayLighter
             #eee
           
          
           
          
             @white
             #fff
           
          
                   
       
          
-    
          
-    
          
       
          Accent colors
          
       
-        
-          
-            
-            
-          
-        
-            
+            
+            
+            
+            
+            
+            
+            
-          
-        
-      
          VariableValue
          
         
           
          @blue@blue
             #049cdb
           
          
           
          
             @green
             #46a546
           
          
           
          
             @red
             #9d261d
           
          
           
          
             @yellow
             #ffc40d
           
          
           
          
             @orange
             #f89406
           
          
           
          
             @pink
             #c3325f
           
          
           
          
             @purple
             #7a43b6
          
-    
          
-  
           
-  
          
-    
          
-      
          Grid system
          
-      
-        
-          
-            
-            
-          
-        
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
          VariableValue
          @gridColumns12
          @gridColumnWidth60px
          @gridGutterWidth20px
          @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
          
-    
          
-    
          
-      
          Typography
          
-      
-        
-          
-            
-            
-          
-        
-        
-          
-            
-            
-          
-          
-            
-            
-            
-          
-          
-            
-            
+            
          VariableValue
          @baseFontSize13px
          @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
          @baseLineHeight18px
           
          
                   
       
          
@@ -311,6 +289,7 @@
           
             @primaryButtonBackground
             @linkColor
+            
           
         
       
@@ -320,6 +299,7 @@
           
             @placeholderText
             @grayLight
+            
           
         
       
@@ -329,26 +309,32 @@
           
             @navbarHeight
             40px
+            
           
           
             @navbarBackground
             @grayDarker
+            
           
           
             @navbarBackgroundHighlight
             @grayDark
+            
           
           
             @navbarText
             @grayLight
+            
           
           
             @navbarLinkColor
             @grayLight
+            
           
           
             @navbarLinkColorHover
             @white
+            
           
         
       
@@ -360,50 +346,42 @@
           
             @warningText
             #f3edd2
+            
           
           
             @warningBackground
             #c09853
-          
-          
-            @warningBorder
-            #f3edd2
+            
           
           
             @errorText
             #b94a48
+            
           
           
             @errorBackground
             #f2dede
-          
-          
-            @errorBorder
-            #e9c7c7
+            
           
           
             @successText
             #468847
+            
           
           
             @successBackground
             #dff0d8
-          
-          
-            @successBorder
-            #cfe8c4
+            
           
           
             @infoText
             #3a87ad
+            
           
           
             @infoBackground
             #d9edf7
-          
-          
-            @infoBorder
-            #bfe1f2
+            
           
         
       
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index ad6688e1e..82b921d24 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -62,168 +62,146 @@
 ================================================== -->
 
          
   
          
-    
          {{_i}}Bootstrap variables {{/i}}
          
+    
          {{_i}}Bootstrap variables LESS variables, their values, and usage guidelines{{/i}}
          
   
          
 
-  
          {{_i}}Hyperlinks{{/i}}
          
-  
-    
-      
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-      
-      
-        
-        
-        
-      
-    
-  
          {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
          @linkColor#08c{{_i}}Default link text color{{/i}}
          @linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
          
-
   
          
     
          
-      
          {{_i}}Grayscale colors{{/i}}
          
+      
          {{_i}}Hyperlinks{{/i}}
          
       
-        
+        
-            
-            
+            
+            
+            
+            
-        
+          
+            
+            
+            
+            
+          
+        
+      
          
           
          {{_i}}Variable{{/i}}{{_i}}Value{{/i}}@linkColor#08c{{_i}}Default link text color{{/i}}
           
          @linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
          
+      
          {{_i}}Grid system{{/i}}
          
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
          @gridColumns12
          @gridColumnWidth60px
          @gridGutterWidth20px
          @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
          
+      
          {{_i}}Typography{{/i}}
          
+      
+        
+          
+            
+            
+          
+          
+            
+            
+            
+          
+          
+            
+            
+          
+        
+      
          @baseFontSize13px
          @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
          @baseLineHeight18px
          
+    
          
+    
          
+      
          {{_i}}Grayscale colors{{/i}}
          
+      
-            
+            
+            
+            
+            
+            
+            
+            
+            
          
         
           
          @black@black
             #000
           
          
           
          
             @grayDarker
             #222
           
          
           
          
             @grayDark
             #333
           
          
           
          
             @gray
             #555
           
          
           
          
             @grayLight
             #999
           
          
           
          
             @grayLighter
             #eee
           
          
           
          
             @white
             #fff
           
          
                   
       
          
-    
          
-    
          
       
          {{_i}}Accent colors{{/i}}
          
       
-        
-          
-            
-            
-          
-        
-            
+            
+            
+            
+            
+            
+            
+            
-          
-        
-      
          {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
          
         
           
          @blue@blue
             #049cdb
           
          
           
          
             @green
             #46a546
           
          
           
          
             @red
             #9d261d
           
          
           
          
             @yellow
             #ffc40d
           
          
           
          
             @orange
             #f89406
           
          
           
          
             @pink
             #c3325f
           
          
           
          
             @purple
             #7a43b6
          
-    
          
-  
           
-  
          
-    
          
-      
          {{_i}}Grid system{{/i}}
          
-      
-        
-          
-            
-            
-          
-        
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
          {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
          @gridColumns12
          @gridColumnWidth60px
          @gridGutterWidth20px
          @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
          
-    
          
-    
          
-      
          {{_i}}Typography{{/i}}
          
-      
-        
-          
-            
-            
-          
-        
-        
-          
-            
-            
-          
-          
-            
-            
-            
-          
-          
-            
-            
+            
          {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
          @baseFontSize13px
          @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
          @baseLineHeight18px
           
          
                   
       
          
@@ -239,6 +217,7 @@
           
             @primaryButtonBackground
             @linkColor
+            
           
         
       
@@ -248,6 +227,7 @@
           
             @placeholderText
             @grayLight
+            
           
         
       
@@ -257,26 +237,32 @@
           
             @navbarHeight
             40px
+            
           
           
             @navbarBackground
             @grayDarker
+            
           
           
             @navbarBackgroundHighlight
             @grayDark
+            
           
           
             @navbarText
             @grayLight
+            
           
           
             @navbarLinkColor
             @grayLight
+            
           
           
             @navbarLinkColorHover
             @white
+            
           
         
       
@@ -288,50 +274,42 @@
           
             @warningText
             #f3edd2
+            
           
           
             @warningBackground
             #c09853
-          
-          
-            @warningBorder
-            #f3edd2
+            
           
           
             @errorText
             #b94a48
+            
           
           
             @errorBackground
             #f2dede
-          
-          
-            @errorBorder
-            #e9c7c7
+            
           
           
             @successText
             #468847
+            
           
           
             @successBackground
             #dff0d8
-          
-          
-            @successBorder
-            #cfe8c4
+            
           
           
             @infoText
             #3a87ad
+            
           
           
             @infoBackground
             #d9edf7
-          
-          
-            @infoBorder
-            #bfe1f2
+            
           
         
       
-- 
cgit v1.2.3


From 7bf27674523c35f8803311a964dc72a7093351c0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 00:07:01 -0800
Subject: remove form docs from the styles and markup, it's no longer needed

---
 docs/assets/css/bootstrap.css          | 13 +++++++-
 docs/assets/css/docs.css               | 17 ----------
 docs/base-css.html                     | 59 ++++++++++++++++------------------
 docs/templates/pages/base-css.mustache | 59 ++++++++++++++++------------------
 4 files changed, 68 insertions(+), 80 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index efd221991..c96818a56 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -943,9 +943,20 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   display: inline-block;
   margin-bottom: 0;
 }
-.form-search label, .form-inline label {
+.form-search label,
+.form-inline label,
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
   display: inline-block;
 }
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on,
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on {
+  vertical-align: middle;
+}
 .control-group {
   margin-bottom: 9px;
 }
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 9b8244d49..74b548628 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -543,19 +543,6 @@ form.well {
   margin: 18px 0;
 }
 
-/* Form docs for horizontal forms */
-.form-docs {
-  padding-left: 10px;
-}
-.form-docs h3,
-.form-docs p,
-.form-docs li {
-  color: #777;
-}
-.form-docs hr {
-  margin: 18px 0;
-}
-
 /* Fake the :focus state to demo it */
 .focused {
   border-color: rgba(82,168,236,.8);
@@ -689,10 +676,6 @@ form.well {
     left: auto;
   }
 
-  /* Forms docs */
-  .form-docs {
-    padding-left: 0; /* down from 10px */
-  }
 }
 
 
diff --git a/docs/base-css.html b/docs/base-css.html
index 4651e9789..3b4032805 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -952,22 +952,20 @@ For example, <code>section</code> should be wrapped as inline.
       
     
          
     
          
-      
          
-        
          What's included
          
-        
          Shown on the left are all the default form controls we support. Here's the bulleted list:
          
-        
            
-          
          • text inputs (text, password, email, etc)
            • 
-          
          • checkbox
            • 
-          
          • radio
            • 
-          
          • select
            • 
-          
          • multiple select
            • 
-          
          • file input
            • 
-          
          • textarea
            • 
-        
          
-        
          
-        
          New defaults with v2.0
          
-        
          Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.
          
-      
          
+      
          What's included
          
+      
          Shown on the left are all the default form controls we support. Here's the bulleted list:
          
+      
            
+        
          • text inputs (text, password, email, etc)
            • 
+        
          • checkbox
            • 
+        
          • radio
            • 
+        
          • select
            • 
+        
          • multiple select
            • 
+        
          • file input
            • 
+        
          • textarea
            • 
+      
          
+      
          
+      
          New defaults with v2.0
          
+      
          Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.
          
     
          
   
          
 
@@ -1047,19 +1045,17 @@ For example, <code>section</code> should be wrapped as inline.
       
     
          
     
          
-      
          
-        
          Redesigned browser states
          
-        
          Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
          
-        
          
-        
          Form validation
          
-        
          It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
          
+      
          Redesigned browser states
          
+      
          Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
          
+      
          
+      
          Form validation
          
+      
          It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
          
 
           <fieldset
   class="control-group error">
   …
 </fieldset>
 
          
-      
          
     
          
   
          
 
@@ -1152,14 +1148,15 @@ For example, <code>section</code> should be wrapped as inline.
       
     
        
     
        
-      
        
-        
        Prepend & append inputs
        
-        
        Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.
        
-        
        
-        
        Checkboxes and radios
        
-        
        Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.
        
-        
        Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.
        
-      
        
+      
        Prepend & append inputs
        
+      
        Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.
        
+      
        
+      
        Checkboxes and radios
        
+      
        Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.
        
+      
        Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.
        
+      
        
+      
        Inline forms and append/prepend
        
+      
        To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.
        
     
        
   
        
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c15fcebd3..b464084df 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -880,22 +880,20 @@
       
     
      
     
      
-      
      
-        
      {{_i}}What's included{{/i}}
      
-        
      {{_i}}Shown on the left are all the default form controls we support. Here's the bulleted list:{{/i}}
      
-        
        
-          
      • {{_i}}text inputs (text, password, email, etc){{/i}}
        • 
-          
      • {{_i}}checkbox{{/i}}
        • 
-          
      • {{_i}}radio{{/i}}
        • 
-          
      • {{_i}}select{{/i}}
        • 
-          
      • {{_i}}multiple select{{/i}}
        • 
-          
      • {{_i}}file input{{/i}}
        • 
-          
      • {{_i}}textarea{{/i}}
        • 
-        
      
-        
      
-        
      {{_i}}New defaults with v2.0{{/i}}
      
-        
      {{_i}}Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.{{/i}}
      
-      
      
+      
      {{_i}}What's included{{/i}}
      
+      
      {{_i}}Shown on the left are all the default form controls we support. Here's the bulleted list:{{/i}}
      
+      
        
+        
      • {{_i}}text inputs (text, password, email, etc){{/i}}
        • 
+        
      • {{_i}}checkbox{{/i}}
        • 
+        
      • {{_i}}radio{{/i}}
        • 
+        
      • {{_i}}select{{/i}}
        • 
+        
      • {{_i}}multiple select{{/i}}
        • 
+        
      • {{_i}}file input{{/i}}
        • 
+        
      • {{_i}}textarea{{/i}}
        • 
+      
      
+      
      
+      
      {{_i}}New defaults with v2.0{{/i}}
      
+      
      {{_i}}Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.{{/i}}
      
     
      
   
      
 
@@ -975,19 +973,17 @@
       
     
      
     
      
-      
      
-        
      {{_i}}Redesigned browser states{{/i}}
      
-        
      {{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.{{/i}}
      
-        
      
-        
      {{_i}}Form validation{{/i}}
      
-        
      {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.{{/i}}
      
+      
      {{_i}}Redesigned browser states{{/i}}
      
+      
      {{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.{{/i}}
      
+      
      
+      
      {{_i}}Form validation{{/i}}
      
+      
      {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.{{/i}}
      
 
       <fieldset
   class="control-group error">
   …
 </fieldset>
 
      
-      
      
     
      
   
      
 
@@ -1080,14 +1076,15 @@
       
     
      
     
      
-      
      
-        
      {{_i}}Prepend & append inputs{{/i}}
      
-        
      {{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}
      
-        
      
-        
      {{_i}}Checkboxes and radios{{/i}}
      
-        
      {{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}
      
-        
      {{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}
      
-      
      
+      
      {{_i}}Prepend & append inputs{{/i}}
      
+      
      {{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}
      
+      
      
+      
      {{_i}}Checkboxes and radios{{/i}}
      
+      
      {{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}
      
+      
      {{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}
      
+      
      
+      
      {{_i}}Inline forms and append/prepend{{/i}}
      
+      
      {{_i}}To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.{{/i}}
      
     
      
   
      
 
-- 
cgit v1.2.3


From 059ff6bcbd48f18431ed66e4b1b2a97a9567b9f7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 02:27:45 -0800
Subject: update hero example and examples overview

---
 docs/examples.html                     | 58 ++++++++++++++++++++++++++--------
 docs/templates/pages/examples.mustache | 58 ++++++++++++++++++++++++++--------
 2 files changed, 88 insertions(+), 28 deletions(-)

(limited to 'docs')

diff --git a/docs/examples.html b/docs/examples.html
index 70a1a54dd..7d79fc0a0 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -82,20 +82,50 @@
 
 
 
-
-
-
      
-  
      
-    
      Examples from 1.x
      
-  
      
-
-
      Container app
      
-
      Fluid layout
      
-
      Reversed fluid layout
      
-
      Hero marketing site
      
-
-
      
+
        
+  
      • 
+    
+      
+    
+    
        Basic marketing site
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Fluid layout
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Fluid layout reversed
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Container application
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Fullscreen
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Simple layout
        
+    
        
+  
        • 
+
      
 
 
      
-
      
-  
      
-    
      {{_i}}Examples from 1.x{{/i}}
      
-  
      
-
-
      Container app
      
-
      Fluid layout
      
-
      Reversed fluid layout
      
-
      Hero marketing site
      
-
-
      
+
        
+  
      • 
+    
+      
+    
+    
        Basic marketing site
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Fluid layout
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Fluid layout reversed
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Container application
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Fullscreen
        
+    
        
+  
        • 
+  
      • 
+    
+      
+    
+    
        Simple layout
        
+    
        
+  
        • 
+
      
-- 
cgit v1.2.3


From 48529ad01fa2a60bfc9179743dcb5379e8ff944f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:06:57 -0800
Subject: last minute addition of a simple fluid grid for our fluid examples;
 it needs work, so we're not documenting it now

---
 docs/assets/css/bootstrap-responsive.css  | 101 ++++++++++++++++++++++++++++--
 docs/assets/css/bootstrap.css             |  76 +++++++++++++---------
 docs/scaffolding.html                     |   1 -
 docs/templates/pages/scaffolding.mustache |   1 -
 4 files changed, 144 insertions(+), 35 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index ca03cecde..44e0125c1 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -77,6 +77,9 @@
     width: auto;
     padding: 0 20px;
   }
+  .row-fluid {
+    width: 100%;
+  }
   .row {
     margin-left: 0;
   }
@@ -162,6 +165,50 @@
   .offset11 {
     margin-left: 702px;
   }
+  .row-fluid {
+    width: 102.76243093919337%;
+    margin-left: -2.762430939%;
+  }
+  .row-fluid [class*="span"] {
+    float: left;
+    margin-left: 2.762430939%;
+  }
+  .row-fluid .span1 {
+    width: 5.6451612899588115%;
+  }
+  .row-fluid .span2 {
+    width: 13.978494622708812%;
+  }
+  .row-fluid .span3 {
+    width: 22.31182795545881%;
+  }
+  .row-fluid .span4 {
+    width: 30.64516128820881%;
+  }
+  .row-fluid .span5 {
+    width: 38.97849462095881%;
+  }
+  .row-fluid .span6 {
+    width: 47.311827953708814%;
+  }
+  .row-fluid .span7 {
+    width: 55.645161286458816%;
+  }
+  .row-fluid .span8 {
+    width: 63.97849461920882%;
+  }
+  .row-fluid .span9 {
+    width: 72.31182795195882%;
+  }
+  .row-fluid .span10 {
+    width: 80.64516128470882%;
+  }
+  .row-fluid .span11 {
+    width: 88.97849461745884%;
+  }
+  .row-fluid .span12 {
+    width: 97.31182795020881%;
+  }
 }
 @media (max-width: 940px) {
   body {
@@ -169,7 +216,7 @@
   }
   .navbar-fixed-top {
     position: static;
-    margin-bottom: 36px;
+    margin-bottom: 18px;
   }
   .navbar-inner {
     padding: 5px;
@@ -264,6 +311,12 @@
   }
 }
 @media (min-width: 1200px) {
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
   .container {
     width: 1170px;
   }
@@ -342,10 +395,48 @@
   .offset11 {
     margin-left: 1130px;
   }
-  .thumbnails {
-    margin-left: -30px;
+  .row-fluid {
+    width: 102.56143440326584%;
+    margin-left: -2.56%;
   }
-  .thumbnails > li {
-    margin-left: 30px;
+  .row-fluid [class*="span"] {
+    float: left;
+    margin-left: 2.56%;
+  }
+  .row-fluid .span1 {
+    width: 5.832601732615312%;
+  }
+  .row-fluid .span2 {
+    width: 14.16126839928198%;
+  }
+  .row-fluid .span3 {
+    width: 22.489935065948643%;
+  }
+  .row-fluid .span4 {
+    width: 30.818601732615313%;
+  }
+  .row-fluid .span5 {
+    width: 39.14726839928198%;
+  }
+  .row-fluid .span6 {
+    width: 47.47593506594863%;
+  }
+  .row-fluid .span7 {
+    width: 55.8046017326153%;
+  }
+  .row-fluid .span8 {
+    width: 64.13326839928197%;
+  }
+  .row-fluid .span9 {
+    width: 72.46193506594864%;
+  }
+  .row-fluid .span10 {
+    width: 80.7906017326153%;
+  }
+  .row-fluid .span11 {
+    width: 89.11926839928198%;
+  }
+  .row-fluid .span12 {
+    width: 97.44793506594864%;
   }
 }
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c96818a56..60383fba0 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -126,7 +126,7 @@ a:hover {
   margin-left: 20px;
 }
 .span1 {
-  width: 60px;
+  width: 59.99999999999999px;
 }
 .span2 {
   width: 140px;
@@ -194,6 +194,50 @@ a:hover {
 .offset11 {
   margin-left: 900px;
 }
+.row-fluid {
+  width: 102.12765957421277%;
+  margin-left: -2.127659574%;
+}
+.row-fluid [class*="span"] {
+  float: left;
+  margin-left: 2.127659574%;
+}
+.row-fluid .span1 {
+  width: 6.249999999619791%;
+}
+.row-fluid .span2 {
+  width: 14.58333333211979%;
+}
+.row-fluid .span3 {
+  width: 22.91666666461979%;
+}
+.row-fluid .span4 {
+  width: 31.24999999711979%;
+}
+.row-fluid .span5 {
+  width: 39.58333332961979%;
+}
+.row-fluid .span6 {
+  width: 47.91666666211979%;
+}
+.row-fluid .span7 {
+  width: 56.24999999461979%;
+}
+.row-fluid .span8 {
+  width: 64.58333332711977%;
+}
+.row-fluid .span9 {
+  width: 72.91666665961978%;
+}
+.row-fluid .span10 {
+  width: 81.24999999211977%;
+}
+.row-fluid .span11 {
+  width: 89.58333332461977%;
+}
+.row-fluid .span12 {
+  width: 97.91666665711978%;
+}
 .container {
   width: 940px;
   margin-left: auto;
@@ -207,42 +251,18 @@ a:hover {
 .container:after {
   clear: both;
 }
-.fluid-container {
-  position: relative;
-  min-width: 940px;
+.container-fluid {
   padding-left: 20px;
   padding-right: 20px;
   *zoom: 1;
 }
-.fluid-container:before, .fluid-container:after {
+.container-fluid:before, .container-fluid:after {
   display: table;
   content: "";
 }
-.fluid-container:after {
+.container-fluid:after {
   clear: both;
 }
-.fluid-sidebar {
-  width: 220px;
-  margin: 0 20px 18px;
-}
-.sidebar-left {
-  padding-left: 260px;
-}
-.sidebar-right {
-  padding-right: 260px;
-}
-.sidebar-left .fluid-sidebar {
-  float: left;
-  margin-left: -240px;
-}
-.sidebar-right .fluid-sidebar {
-  float: right;
-  margin-right: -240px;
-}
-.fluid-content {
-  float: left;
-  width: 100%;
-}
 p {
   margin: 0 0 9px;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 184b35608..b00f5630b 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -124,7 +124,6 @@
   
      
     
      12
      
   
      
-
   
      
     
      
       
      The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.
      
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 6d5a66f8d..239d15265 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -52,7 +52,6 @@
   
      
     
      12
      
   
      
-
   
      
     
      
       
      {{_i}}The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.{{/i}}
      
-- 
cgit v1.2.3


From 8c763589a2058785936a33088935c50f622859de Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:09:10 -0800
Subject: update text on icons note

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/base-css.html b/docs/base-css.html
index 3b4032805..0b2c4547e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1407,7 +1407,7 @@ For example, <code>section</code> should be wrapped as inline.
     
      
   
      
   
      
-    Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.
+    Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to hightlight the icon's size.
   
      
 
   
      
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index b464084df..2b9a459c8 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1335,7 +1335,7 @@
     
      
   
      
   
      
-    {{_i}}Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.{{/i}}
+    {{_i}}Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to hightlight the icon's size.{{/i}}
   
      
 
   
      
-- 
cgit v1.2.3


From 4e5b0e185e8cc9df3a77361380a44b16689fd2f7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:12:13 -0800
Subject: refined pager styles to give a border on the links and improved hover
 state

---
 docs/assets/css/bootstrap.css | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 60383fba0..3f36aaa4d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2707,12 +2707,17 @@ button.btn.small, input[type="submit"].btn.small {
 }
 .pager a {
   display: inline-block;
-  padding: 6px 15px;
-  background-color: #f5f5f5;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
   -webkit-border-radius: 15px;
   -moz-border-radius: 15px;
   border-radius: 15px;
 }
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
 .pager .next a {
   float: right;
 }
-- 
cgit v1.2.3


From 9fa8bde44d9bb6f26b16c7633a01bbe5ce7b20a4 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:15:38 -0800
Subject: fix animated/striped gradients in progress bars

---
 docs/assets/css/bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3f36aaa4d..675446f62 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3127,7 +3127,7 @@ a.thumbnail:hover {
   -o-transition: width 0.6s ease;
   transition: width 0.6s ease;
 }
-.progress.striped .bar {
+.progress-striped .bar {
   background-color: #62c462;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-- 
cgit v1.2.3