From a486a6f20b6502cf260368f5e0e423a7db2c6284 Mon Sep 17 00:00:00 2001 From: Jari Jokinen Date: Wed, 1 Feb 2012 12:59:38 +0200 Subject: Allow labels to be links --- less/labels.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/less/labels.less b/less/labels.less index c0f427750..923f1b84c 100644 --- a/less/labels.less +++ b/less/labels.less @@ -14,3 +14,7 @@ .label-warning { background-color: @orange; } .label-success { background-color: @successText; } .label-info { background-color: @infoText; } +.label:hover { + color: @white; + text-decoration: none; +} -- cgit v1.2.3 From b96e80cf3933cb5788cc21247e68b5cd2e0cbc94 Mon Sep 17 00:00:00 2001 From: Michael Shafrir Date: Wed, 1 Feb 2012 09:58:08 -0800 Subject: Fix broken named anchor link for LESS compiling instructions. --- docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 7f9c9de66..5dcfc7ca2 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -242,7 +242,7 @@

How to customize

-

Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.

+

Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.

Staying responsive

diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index bfbd879d5..dc2a1a6fc 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -166,7 +166,7 @@

{{_i}}How to customize{{/i}}

-

{{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.{{/i}}

+

{{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.{{/i}}

{{_i}}Staying responsive{{/i}}

-- cgit v1.2.3 From 981cbfb4fa6d22b13aff08fc5820481ab1e613c6 Mon Sep 17 00:00:00 2001 From: eirikb Date: Wed, 1 Feb 2012 19:40:10 +0100 Subject: Removed extra / from 'Get the javascript'-link in components.html --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components.html b/docs/components.html index 0ccbf512e..526839729 100644 --- a/docs/components.html +++ b/docs/components.html @@ -605,7 +605,7 @@

Custom jQuery plugin

All tabbable tabs are powered by our lightweight jQuery plugin. Read more about how to bring tabbable tabs to life on the javascript docs page.

-

Get the javascript →

+

Get the javascript →

-- cgit v1.2.3 From 12ed7a2b33a7a76ec29081c52cd9fc0814c9df9a Mon Sep 17 00:00:00 2001 From: eirikb Date: Wed, 1 Feb 2012 19:44:33 +0100 Subject: Removed / from 'Get the javascript' in components.mustache --- docs/templates/pages/components.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index ab11337df..c251ed04b 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -529,7 +529,7 @@

{{_i}}Custom jQuery plugin{{/i}}

{{_i}}All tabbable tabs are powered by our lightweight jQuery plugin. Read more about how to bring tabbable tabs to life on the javascript docs page.{{/i}}

-

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

+

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

-- cgit v1.2.3 From c3c13a247490cf177646dc2a9186b3a4e4c4242b Mon Sep 17 00:00:00 2001 From: Cary Landholt Date: Wed, 1 Feb 2012 22:20:24 -0600 Subject: Fixed typo "tabs" ==> "button" --- js/tests/unit/bootstrap-button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/tests/unit/bootstrap-button.js b/js/tests/unit/bootstrap-button.js index 59e8f33bc..8aed857e1 100644 --- a/js/tests/unit/bootstrap-button.js +++ b/js/tests/unit/bootstrap-button.js @@ -3,7 +3,7 @@ $(function () { module("bootstrap-buttons") test("should be defined on jquery object", function () { - ok($(document.body).button, 'tabs method is defined') + ok($(document.body).button, 'button method is defined') }) test("should return element", function () { -- cgit v1.2.3 From 4211f21e39631179753d6775e3ad90be05ab5f8f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:27:11 -0800 Subject: #1571: remove fixed width on file inputs --- docs/assets/bootstrap.zip | Bin 56824 -> 56825 bytes docs/assets/css/bootstrap.css | 1 + less/forms.less | 1 + 3 files changed, 2 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index a1ef66887..c4ddd0f26 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a90e31930..9de317af5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -570,6 +570,7 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { border-radius: 0; } input[type="file"] { + width: auto; padding: initial; line-height: initial; border: initial; diff --git a/less/forms.less b/less/forms.less index 9c9a9b8a9..ccf3c67fa 100644 --- a/less/forms.less +++ b/less/forms.less @@ -91,6 +91,7 @@ input[type="radio"] { // Reset the file input to browser defaults input[type="file"] { + width: auto; padding: initial; line-height: initial; border: initial; -- cgit v1.2.3 From 43d797dfff839013deb726a55edf082378444640 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:29:15 -0800 Subject: #1566: add note about removal of secondary-nav in 2.0 --- docs/assets/bootstrap.zip | Bin 56825 -> 56825 bytes docs/templates/pages/upgrading.mustache | 1 + docs/upgrading.html | 1 + 3 files changed, 2 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c4ddd0f26..deab7e441 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index 02d1c7feb..30b843e0d 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -119,6 +119,7 @@
  • {{_i}}Base class changed from .topbar to .navbar{{/i}}
  • {{_i}}Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed){{/i}}
    • +
  • {{_i}}Removed the .secondary-nav class; instead, just use .pull-right for right-aligned nav{{/i}}
  • {{_i}}Added vertical dividers to top-level nav{{/i}}
  • {{_i}}Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.{{/i}}
  • {{_i}}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.{{/i}}
    • diff --git a/docs/upgrading.html b/docs/upgrading.html index 4d8328b7c..f3b18e4ed 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -195,6 +195,7 @@
    • 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)
      • +
    • Removed the .secondary-nav class; instead, just use .pull-right for right-aligned nav
    • 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.
      • -- cgit v1.2.3 From 58fd0dea36173c8672fd77cf06df2ccfbeb4d068 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:51:01 -0800 Subject: fixing some docs pages for i18n --- docs/assets/bootstrap.zip | Bin 56825 -> 56825 bytes docs/templates/pages/components.mustache | 10 +++++----- docs/templates/pages/index.mustache | 4 ++-- docs/templates/pages/javascript.mustache | 12 ++++++------ docs/templates/pages/less.mustache | 10 +++++----- docs/templates/pages/scaffolding.mustache | 4 ++-- docs/templates/pages/upgrading.mustache | 1 - docs/upgrading.html | 1 - 8 files changed, 20 insertions(+), 22 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index deab7e441..4647e747b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index d7b3efcae..d8218ecc0 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -8,8 +8,8 @@
    • {{_i}}Buttons{{/i}}
    • @@ -752,17 +752,17 @@ <div class="navbar-inner"> <div class="container"> - <!-- .btn-navbar is used as the toggle for collapsed navbar content --> + <!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} --> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </a> - <!-- Be sure to leave the brand out there if you want it shown --> + <!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} --> <a class="brand" href="#">{{_i}}Project name{{/i}}</a> - <!-- Everything you want hidden at 940px or less, place within here --> + <!-- {{_i}}Everything you want hidden at 940px or less, place within here{{/i}} --> <div class="nav-collapse"> <!-- .nav, .navbar-search, .navbar-form, etc --> </div> diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index f7cadc081..2f3acc200 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -3,7 +3,7 @@

      {{_i}}Bootstrap, from Twitter{{/i}}

      -

      Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.

      +

      {{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}

      {{_i}}View project on GitHub{{/i}} {{_i}}Download Bootstrap{{/i}} @@ -11,7 +11,7 @@

        -
      • Upgrading from 1.4
        • +
      • {{_i}}Upgrading from 1.4{{/i}}
      • {{_i}}Issues{{/i}}
      • {{_i}}Roadmap{{/i}}
      • {{_i}}Changelog{{/i}}
        • diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index aedd21f53..3233a9b76 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -947,17 +947,17 @@ $('#my-alert').bind('closed', function () {

        {{_i}}Markup{{/i}}

        {{_i}}Data attributes are integral to the button plugin. Check out the example code below for the various markup types.{{/i}}

        -<!-- Add data-toggle="button" to activate toggling on a single button -->
+<!-- {{_i}}Add data-toggle="button" to activate toggling on a single button{{/i}} -->
 <button class="btn" data-toggle="button">Single Toggle</button>
 
-<!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
+<!-- {{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group{{/i}} -->
 <div class="btn-group" data-toggle="buttons-checkbox">
   <button class="btn">Left</button>
   <button class="btn">Middle</button>
   <button class="btn">Right</button>
 </div>
 
-<!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
+<!-- {{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group{{/i}} -->
 <div class="btn-group" data-toggle="buttons-radio">
   <button class="btn">Left</button>
   <button class="btn">Middle</button>
@@ -1052,7 +1052,7 @@ $('#my-alert').bind('closed', function () {
 
           
        
           
        {{_i}}Using bootstrap-collapse.js{{/i}}
        
-          
        Enable via javascript:
        
+          
        {{_i}}Enable via javascript:{{/i}}
        
           
        $(".collapse").collapse()
        
           
        {{_i}}Options{{/i}}
        
           
@@ -1220,11 +1220,11 @@ $('#myCollapsible').on('hidden', function () {
           
        {{_i}}Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.{{/i}}
         <div class="carousel">
-  <!-- Carousel items -->
+  <!-- {{_i}}Carousel items{{/i}} -->
   <div class="carousel-inner">
     ...
   </div>
-  <!-- Carousel nav -->
+  <!-- {{_i}}Carousel nav{{/i}} -->
   <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
   <a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
 </div>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index f69e43c20..eff8d3844 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -210,7 +210,7 @@
   
        {{_i}}Components{{/i}}
        
   
        
     
        
-      
        Buttons
        
+      
        {{_i}}Buttons{{/i}}
        
       
        
 
        
@@ -220,7 +220,7 @@
           
        
         
           
        
                 
       
        
-      
        Forms
        
+      
        {{_i}}Forms{{/i}}
        
       
@@ -230,7 +230,7 @@
           
        
         
           
        
                 
       
        
-      
        Navbar
        
+      
        {{_i}}Navbar{{/i}}
        
       
@@ -495,7 +495,7 @@
       
        
         
           
        
             
   
        
-  
        CSS3 properties
        
+  
        {{_i}}CSS3 properties{{/i}}
        
   
@@ -567,7 +567,7 @@
       
        
     
       
        
     
   
        
-  
        Backgrounds and gradients
        
+  
        {{_i}}Backgrounds and gradients{{/i}}
        
   
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index e20c52402..36df0973b 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -21,7 +21,7 @@
     
        {{_i}}Grid system 12 columns with a responsive twist{{/i}}
        
 
-  
        Default 940px grid
        
+  
        {{_i}}Default 940px grid{{/i}}
        
     
        1
        
     
        1
        
@@ -72,7 +72,7 @@
 
   
        
 
-  
        Offsetting columns
        
+  
        {{_i}}Offsetting columns{{/i}}
        
   
        
     
        4
        
     
        4 offset 4
        
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 30b843e0d..02d1c7feb 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -119,7 +119,6 @@
   
          
     
        • {{_i}}Base class changed from .topbar to .navbar{{/i}}
          • 
     
        • {{_i}}Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed){{/i}}
          • 
-    
        • {{_i}}Removed the .secondary-nav class; instead, just use .pull-right for right-aligned nav{{/i}}
          • 
     
        • {{_i}}Added vertical dividers to top-level nav{{/i}}
          • 
     
        • {{_i}}Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.{{/i}}
          • 
     
        • {{_i}}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.{{/i}}
          • 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index f3b18e4ed..4d8328b7c 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -195,7 +195,6 @@
   
            
     
          • 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)
            • 
-    
          • Removed the .secondary-nav class; instead, just use .pull-right for right-aligned nav
            • 
     
          • 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.
            • 
-- 
cgit v1.2.3


From 25ffe14c1bf43539d12b459a3807d37d826d1246 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 1 Feb 2012 23:02:31 -0800
Subject: add line item to docs on upgrading per #1488

---
 docs/assets/bootstrap.zip               | Bin 52356 -> 52356 bytes
 docs/templates/pages/upgrading.mustache |   1 +
 docs/upgrading.html                     |   1 +
 3 files changed, 2 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index faef1d7ea..12aef2c01 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 02d1c7feb..5511e191b 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -128,6 +128,7 @@
   
              
     
            • {{_i}}Updated the .dropdown-menu to tighten up spacing{{/i}}
              • 
     
            • {{_i}}Now requires you to add a <span class="caret"></span> to show the dropdown arrow{{/i}}
              • 
+    
            • {{_i}}Now requires you to add a data-toggle="dropdown" attribute to obtain toggling behavior{{/i}}
              • 
     
            • {{_i}}The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.{{/i}}
              • 
   
            
   
            {{_i}}Labels{{/i}}
            
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 4d8328b7c..7398952ba 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -204,6 +204,7 @@
   
              
     
            • Updated the .dropdown-menu to tighten up spacing
              • 
     
            • Now requires you to add a <span class="caret"></span> to show the dropdown arrow
              • 
+    
            • Now requires you to add a data-toggle="dropdown" attribute to obtain toggling behavior
              • 
     
            • The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.
              • 
   
            
   
            Labels
            
-- 
cgit v1.2.3


From 1ec6628e8005b17ecf16b194450874d8e988a45d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 1 Feb 2012 23:10:00 -0800
Subject: add note for icon class usage per #1501

---
 docs/assets/bootstrap.zip              | Bin 52356 -> 52356 bytes
 docs/base-css.html                     |   4 ++++
 docs/templates/pages/base-css.mustache |   4 ++++
 3 files changed, 8 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 12aef2c01..c1b04c36b 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index a198064f8..f6fcda10c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1469,6 +1469,10 @@ For example, <code>section</code> should be wrapped as inline.
 <i class="icon-search icon-white"></i>
 
       
            There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
            
+      
            
+        Heads up!
+        The .icon- class must be listed first in the class tag for proper CSS targeting.
+      
            
     
        
     
        
       
        Use cases
        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 634809715..892442cee 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1393,6 +1393,10 @@
 <i class="icon-search icon-white"></i>
 
       
        {{_i}}There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
        
+      
        
+        {{_i}}Heads up!{{/i}}
+        {{_i}}The .icon- class must be listed first in the class tag for proper CSS targeting.{{/i}}
+      
        
     
        
     
        
       
        {{_i}}Use cases{{/i}}
        
-- 
cgit v1.2.3


From 8dd2b3d3f8c84ac242469ae24fe7981b0a916b25 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 1 Feb 2012 23:10:37 -0800
Subject: follow up to #1501 to update notes in sprites.less

---
 docs/assets/bootstrap.zip | Bin 52356 -> 52356 bytes
 less/sprites.less         |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c1b04c36b..b5e20a25e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/less/sprites.less b/less/sprites.less
index a56216c71..921c662d7 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -9,10 +9,10 @@
 // All icons receive the styles of the  tag with a base class 
 // of .i and are then given a unique class to add width, height, 
 // and background-position. Your resulting HTML will look like
-// .
+// .
 
 // For the white version of the  icons, just add the .icon-white class:
-// 
+// 
 
 [class^="icon-"] {
   display: inline-block;
-- 
cgit v1.2.3


From 99f395bcd7ad18ec1ef63b88516e98b294b5bc12 Mon Sep 17 00:00:00 2001
From: Kyle Robinson Young 
Date: Wed, 1 Feb 2012 23:30:37 -0800
Subject: Typo fixes

---
 docs/base-css.html                       | 4 ++--
 docs/components.html                     | 4 ++--
 docs/javascript.html                     | 6 +++---
 docs/less.html                           | 2 +-
 docs/templates/pages/base-css.mustache   | 4 ++--
 docs/templates/pages/components.mustache | 4 ++--
 docs/templates/pages/javascript.mustache | 6 +++---
 docs/templates/pages/less.mustache       | 2 +-
 docs/templates/pages/upgrading.mustache  | 2 +-
 docs/upgrading.html                      | 2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 5176c3ecf..efe55cbcf 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -530,7 +530,7 @@ For example, <code>section</code> should be wrapped as inline.
         
        
-        
+        
@@ -1446,7 +1446,7 @@ For example, <code>section</code> should be wrapped as inline.
     
   
   
        
-    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.
+    Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to highlight the icon's size.
   
        
 
   
        
diff --git a/docs/components.html b/docs/components.html
index a71788eca..22708c170 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1021,7 +1021,7 @@
   
        
     
        
       
        About pager
        
-      
        The pager component is a set of links for simple pagination implemenations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.
        
+      
        The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.
        
     
        
     
        
       
        Default example
        
@@ -1282,7 +1282,7 @@
   
        
     
        
       
        Rewritten base class
        
-      
        With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.
        
+      
        With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outer <div>.
        
       
        Single alert message
        
       
        For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.
        
       
        
diff --git a/docs/javascript.html b/docs/javascript.html
index db6948392..65deacbd9 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -134,7 +134,7 @@
         
        
           
         
        
         
        
@@ -628,7 +628,7 @@ $('#myModal').on('hidden', function () {
   <li><a href="#home" data-toggle="tab">Home</a></li>
   <li><a href="#profile" data-toggle="tab">Profile</a></li>
   <li><a href="#messages" data-toggle="tab">Messages</a></li>
-  <li><a href="#ettings" data-toggle="tab">Settings</a></li>
+  <li><a href="#settings" data-toggle="tab">Settings</a></li>
 </ul>
           
        Methods
        
           
        $().tab
        
@@ -1145,7 +1145,7 @@ $('#my-alert').bind('closed', function () {
                
        
-               
+               
diff --git a/docs/less.html b/docs/less.html
index 739ebf2cd..7fd68123f 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -614,7 +614,7 @@
       
-        
+        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 634809715..aff5ec089 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -454,7 +454,7 @@
         
-        
+        
@@ -1370,7 +1370,7 @@
     
   
   
        
-    {{_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}}
+    {{_i}}Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to highlight the icon's size.{{/i}}
   
        
 
   
        
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index d7b3efcae..43aa5ad8f 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -945,7 +945,7 @@
   
        
     
        
       
        {{_i}}About pager{{/i}}
        
-      
        {{_i}}The pager component is a set of links for simple pagination implemenations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}
        
+      
        {{_i}}The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}
        
     
        
     
        
       
        {{_i}}Default example{{/i}}
        
@@ -1206,7 +1206,7 @@
   
        
     
        
       
        {{_i}}Rewritten base class{{/i}}
        
-      
        {{_i}}With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.{{/i}}
        
+      
        {{_i}}With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outer <div>.{{/i}}
        
       
        {{_i}}Single alert message{{/i}}
        
       
        {{_i}}For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.{{/i}}
        
       
        
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index aedd21f53..961428dbf 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -58,7 +58,7 @@
         
        
           
         
        
         
        
@@ -552,7 +552,7 @@ $('#myModal').on('hidden', function () {
   <li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
   <li><a href="#profile" data-toggle="tab">{{_i}}Profile{{/i}}</a></li>
   <li><a href="#messages" data-toggle="tab">{{_i}}Messages{{/i}}</a></li>
-  <li><a href="#ettings" data-toggle="tab">{{_i}}Settings{{/i}}</a></li>
+  <li><a href="#settings" data-toggle="tab">{{_i}}Settings{{/i}}</a></li>
 </ul>
           
        {{_i}}Methods{{/i}}
        
           
        $().tab
        
@@ -1069,7 +1069,7 @@ $('#my-alert').bind('closed', function () {
                
        
-               
+               
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index f69e43c20..68e444566 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -538,7 +538,7 @@
       
-        
+        
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 02d1c7feb..5c40e0798 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -144,7 +144,7 @@
   
          
     
        • {{_i}}New base class: .alert instead of .alert-message{{/i}}
          • 
     
        • {{_i}}Class names standardized for other options, now all starting with .alert-{{/i}}
          • 
-    
        • {{_i}}Redesigned base alert styles to combine the deafult alerts and block-level alerts into one{{/i}}
          • 
+    
        • {{_i}}Redesigned base alert styles to combine the default alerts and block-level alerts into one{{/i}}
          • 
     
        • {{_i}}Block level alert class changed: .alert-block instead of .block-message{{/i}}
          • 
   
        
   
        {{_i}}Progress bars{{/i}}
        
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 098bcbdc9..9ee5e3fbe 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -220,7 +220,7 @@
   
          
     
        • New base class: .alert instead of .alert-message
          • 
     
        • Class names standardized for other options, now all starting with .alert-
          • 
-    
        • Redesigned base alert styles to combine the deafult alerts and block-level alerts into one
          • 
+    
        • Redesigned base alert styles to combine the default alerts and block-level alerts into one
          • 
     
        • Block level alert class changed: .alert-block instead of .block-message
          • 
   
        
   
        Progress bars
        
-- 
cgit v1.2.3


From 41587018943ac02d91c6298008b01b808aab53fe Mon Sep 17 00:00:00 2001
From: zhongwei99 
Date: Thu, 2 Feb 2012 18:01:16 +0800
Subject: Minor typo fix.

---
 less/reset.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/less/reset.less b/less/reset.less
index 28d8eb60c..1115f59d8 100644
--- a/less/reset.less
+++ b/less/reset.less
@@ -108,7 +108,7 @@ input[type="button"],
 input[type="reset"],
 input[type="submit"] {
   cursor: pointer; // Cursors on all buttons applied consistently
-  -webkit-appearance: button; // Style clicable inputs in iOS
+  -webkit-appearance: button; // Style clickable inputs in iOS
 }
 input[type="search"] { // Appearance in Safari/Chrome
   -webkit-appearance: textfield;
-- 
cgit v1.2.3


From dfdc63e87293efec9196897079ce3826a1a57275 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 2 Feb 2012 09:31:07 -0800
Subject: fix incorrect use of 'caret'

---
 docs/assets/bootstrap.zip              | Bin 52356 -> 52356 bytes
 docs/base-css.html                     |   2 +-
 docs/templates/pages/base-css.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b5e20a25e..a71011ad2 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index f6fcda10c..38f851164 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -375,7 +375,7 @@ For example, <code>section</code> should be wrapped as inline.
     
     
        
       
        Basic block
        
-      
        Use <pre> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.
        
+      
        Use <pre> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.
        
 
         <p>Sample text here...</p>
 
        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 892442cee..c1656ee6b 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -299,7 +299,7 @@
     
        
     
        
       
        Basic block
        
-      
        {{_i}}Use <pre> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.{{/i}}
        
+      
        {{_i}}Use <pre> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.{{/i}}
        
 
         <p>{{_i}}Sample text here...{{/i}}</p>
 
        
-- 
cgit v1.2.3


From cf488c2800293f4f243f59658b691741f4b78175 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 2 Feb 2012 09:33:18 -0800
Subject: fix incorrect uses of it's in the docs

---
 docs/assets/bootstrap.zip                | Bin 52356 -> 52356 bytes
 docs/base-css.html                       |   2 +-
 docs/javascript.html                     |   4 ++--
 docs/less.html                           |   4 ++--
 docs/templates/pages/base-css.mustache   |   2 +-
 docs/templates/pages/javascript.mustache |   4 ++--
 docs/templates/pages/less.mustache       |   4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a71011ad2..f9690b608 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 38f851164..ac297c645 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1056,7 +1056,7 @@ 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.
        
+      
        Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.
        
       
        
       
        Form validation
        
       
        It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.
        
diff --git a/docs/javascript.html b/docs/javascript.html
index 92e327d19..4c432ee7c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1042,7 +1042,7 @@ $('#my-alert').bind('closed', function () {
 
           
        Methods
        
           
        $().button('toggle')
        
-          
        Toggles push state. Gives btn the look that it's been activated.
        
+          
        Toggles push state. Gives btn the look that it hass been activated.
        
           
        
             Heads up!
             You can enable auto toggling of a button by using the data-toggle attribute.
@@ -1339,7 +1339,7 @@ $('.myCarousel').carousel({
              
        
-               
+               
        
     
       
        
   
   
           .table-bordered
         Rounds corners and adds outter borderRounds corners and adds outer border
       
        
       
        
         Zebra-stripeparent
                selector
                falseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior)
              
        
              
        
                toggle
        
         .background-clip()
         @clipCrop the backgroud of an element (useful for border-radius)Crop the background of an element (useful for border-radius)
       
        
       
        
         .background-size()
           .table-bordered
         {{_i}}Rounds corners and adds outter border{{/i}}{{_i}}Rounds corners and adds outer border{{/i}}
       
        
       
        
         {{_i}}Zebra-stripe{{/i}}{{_i}}parent{{/i}}
                {{_i}}selector{{/i}}
                false{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior){{/i}}{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior){{/i}}
              
        
              
        
                {{_i}}toggle{{/i}}
        
         .background-clip()
         @clip{{_i}}Crop the backgroud of an element (useful for border-radius){{/i}}{{_i}}Crop the background of an element (useful for border-radius){{/i}}
       
        
       
        
         .background-size()
        
              
        
                slidThis event is fired when the carousel has completed it's slide transition.This event is fired when the carousel has completed its slide transition.
              
        
             
           
        
diff --git a/docs/less.html b/docs/less.html
index bb033cfa3..181ae9b26 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -100,7 +100,7 @@
   
        
     
        
       
        Why LESS?
        
-      
        Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
        
+      
        Bootstrap is made with LESS at its core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
        
     
        
     
        
       
        What's included?
        
@@ -604,7 +604,7 @@
       
         .scale()
         @ratio
-        Scale an element to n times it's original size
+        Scale an element to n times its original size
       
       
         .translate()
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c1656ee6b..420b00226 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -980,7 +980,7 @@
     
        
     
        
       
        {{_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}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.{{/i}}
        
       
        
       
        {{_i}}Form validation{{/i}}
        
       
        {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}
        
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 3233a9b76..b8b1f3da4 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -966,7 +966,7 @@ $('#my-alert').bind('closed', function () {

        {{_i}}Methods{{/i}}

        $().button('toggle')

        -

        {{_i}}Toggles push state. Gives btn the look that it's been activated.{{/i}}

        +

        {{_i}}Toggles push state. Gives btn the look that it hass been activated.{{/i}}

        {{_i}}Heads up!{{/i}} {{_i}}You can enable auto toggling of a button by using the data-toggle attribute.{{/i}} @@ -1263,7 +1263,7 @@ $('.myCarousel').carousel({ {{_i}}slid{{/i}} - {{_i}}This event is fired when the carousel has completed it's slide transition.{{/i}} + {{_i}}This event is fired when the carousel has completed its slide transition.{{/i}} diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index eff8d3844..3b04164d0 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -24,7 +24,7 @@

        {{_i}}Why LESS?{{/i}}

        -

        {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

        +

        {{_i}}Bootstrap is made with LESS at its core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

        {{_i}}What's included?{{/i}}

        @@ -528,7 +528,7 @@ .scale() @ratio - {{_i}}Scale an element to n times it's original size{{/i}} + {{_i}}Scale an element to n times its original size{{/i}} .translate() -- cgit v1.2.3 From bd0e95200390d773b4440d0b7e4cc46091300bbd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:36:33 -0800 Subject: fix inverted warning text and bg colors in less docs page --- docs/assets/bootstrap.zip | Bin 52356 -> 52356 bytes docs/less.html | 8 ++++---- docs/templates/pages/less.mustache | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f9690b608..9b35eae93 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index 181ae9b26..16d3d02de 100644 --- a/docs/less.html +++ b/docs/less.html @@ -348,13 +348,13 @@ @warningText - #f3edd2 - + #c09853 + @warningBackground - #c09853 - + #f3edd2 + @errorText diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 3b04164d0..0826a9e31 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -272,13 +272,13 @@ @warningText - #f3edd2 - + #c09853 + @warningBackground - #c09853 - + #f3edd2 + @errorText -- cgit v1.2.3 From e92e9f1138d8aa6a7ccc640ce3fb091bbf07acfd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:46:14 -0800 Subject: add count to follow button, tweak links to fit on one line for 940px --- docs/assets/bootstrap.zip | Bin 52356 -> 52356 bytes docs/index.html | 9 ++++----- docs/templates/pages/index.mustache | 9 ++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 9b35eae93..12e0c76b2 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/index.html b/docs/index.html index dcf39a792..1c9c6e05f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -89,18 +89,17 @@
        • Upgrading from 1.4
        • Issues
          • -
        • Roadmap
          • -
        • Changelog
          • +
        • Roadmap & changelog
        • ·
        • - +
        • - +
        • ·
        • diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 2f3acc200..4f0573cfd 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -13,18 +13,17 @@
          • {{_i}}Upgrading from 1.4{{/i}}
          • {{_i}}Issues{{/i}}
            • -
          • {{_i}}Roadmap{{/i}}
            • -
          • {{_i}}Changelog{{/i}}
            • +
          • {{_i}}Roadmap & changelog{{/i}}
          • ·
          • - +
          • - +
          • ·
          • -- cgit v1.2.3 From 9ab843b936a6bc9889f0f55a83f13cb25a3990bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:57:22 -0800 Subject: add mention of classes to use for button sizes --- docs/assets/bootstrap.zip | Bin 52356 -> 52356 bytes docs/base-css.html | 2 +- docs/templates/pages/base-css.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 12e0c76b2..b4d58a8ac 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index 8c504d814..3c9e9a187 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1262,7 +1262,7 @@ For example, <code>section</code> should be wrapped as inline.

            Multiple sizes

            -

            Fancy larger or smaller buttons? Have at it!

            +

            Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.

            Primary action Action diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 27c9a96fd..5c0444d1a 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1186,7 +1186,7 @@

            {{_i}}Multiple sizes{{/i}}

            -

            {{_i}}Fancy larger or smaller buttons? Have at it!{{/i}}

            +

            {{_i}}Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.{{/i}}

            {{_i}}Primary action{{/i}} {{_i}}Action{{/i}} -- cgit v1.2.3 From ced08f69359f3a70771804a98fa3c499f388cc74 Mon Sep 17 00:00:00 2001 From: Eric Thomas Date: Thu, 2 Feb 2012 11:02:14 -0800 Subject: Wrap long breadcrumb trails --- less/breadcrumbs.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 19b8081e1..39060bad2 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -9,7 +9,7 @@ .border-radius(3px); .box-shadow(inset 0 1px 0 @white); li { - display: inline; + display: inline-block; text-shadow: 0 1px 0 @white; } .divider { -- cgit v1.2.3 From f922a0800b4ec46fe3aa1e31427308954e86940e Mon Sep 17 00:00:00 2001 From: Noah Blon Date: Fri, 3 Feb 2012 10:34:03 -0600 Subject: Fixes typo on download page Changed chose to choose spelling error on download template --- docs/templates/pages/download.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index f6d319d6a..fe38d1450 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -17,7 +17,7 @@

            {{_i}}Toggle all{{/i}}

            - {{_i}}1. Chose components{{/i}} + {{_i}}1. Choose components{{/i}} {{_i}}Get just the CSS you need{{/i}}

            -- cgit v1.2.3 From ac98cee6092738eb431ebd4c944886358dab721f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:26:04 -0800 Subject: allow alternate form layouts to hide inputs with .hide on them --- docs/assets/bootstrap.zip | Bin 52356 -> 52387 bytes docs/assets/css/bootstrap.css | 3 +++ docs/base-css.html | 2 +- docs/templates/pages/base-css.mustache | 2 +- less/forms.less | 4 ++++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b4d58a8ac..b10376a63 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9de317af5..1ded1be23 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -940,6 +940,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; margin-bottom: 0; } +.form-search .hide, .form-inline .hide, .form-horizontal .hide { + display: none; +} .form-search label, .form-inline label, .form-search .input-append, diff --git a/docs/base-css.html b/docs/base-css.html index 3c9e9a187..48f042417 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -886,7 +886,7 @@ For example, <code>section</code> should be wrapped as inline.

            Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.

            -
            + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5c0444d1a..fd9a82f50 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -810,7 +810,7 @@

            {{_i}}Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.{{/i}}

            - + diff --git a/less/forms.less b/less/forms.less index ccf3c67fa..31442fa36 100644 --- a/less/forms.less +++ b/less/forms.less @@ -462,6 +462,10 @@ select:focus:required:invalid { display: inline-block; margin-bottom: 0; } + // Re-hide hidden elements due to specifity + .hide { + display: none; + } } .form-search label, .form-inline label, -- cgit v1.2.3 From 9259e24f7370185b33520681000854d421ae1e1d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:27:05 -0800 Subject: fix cutoff follow button --- docs/assets/bootstrap.zip | Bin 52387 -> 52387 bytes docs/index.html | 2 +- docs/templates/pages/index.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b10376a63..7f9ed29aa 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/index.html b/docs/index.html index 1c9c6e05f..51da2a55f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -99,7 +99,7 @@
          • ·
          • diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 4f0573cfd..9fee412a5 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -23,7 +23,7 @@
          • ·
          • -- cgit v1.2.3 From 81d1f3b96ea5c78d2e570c07c4c419a32a9b212c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:52:25 -0800 Subject: remove max-width on dropdown menus --- docs/assets/bootstrap.zip | Bin 52387 -> 52381 bytes docs/assets/css/bootstrap.css | 1 - less/dropdowns.less | 1 - 3 files changed, 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7f9ed29aa..ae23a7c98 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1ded1be23..7d28ab36d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1533,7 +1533,6 @@ table .span12 { float: left; display: none; min-width: 160px; - max-width: 220px; _width: 160px; padding: 4px 0; margin: 0; diff --git a/less/dropdowns.less b/less/dropdowns.less index 83f535ae8..118430871 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -46,7 +46,6 @@ float: left; display: none; // none by default, but block on "open" of the menu min-width: 160px; - max-width: 220px; _width: 160px; padding: 4px 0; margin: 0; // override default ul -- cgit v1.2.3 From 7e81f84b29da8ba87fb4aefcc11946002ad9962c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:22:19 -0800 Subject: buttons and icons updated for improved placement and variable support for icon paths --- docs/assets/bootstrap.zip | Bin 52381 -> 52391 bytes docs/assets/css/bootstrap.css | 9 +++++---- less/buttons.less | 4 ++-- less/sprites.less | 5 +++-- less/variables.less | 18 +++++++++++------- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index ae23a7c98..1ebcf34ce 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7d28ab36d..459e207b7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1122,8 +1122,9 @@ table .span12 { display: inline-block; width: 14px; height: 14px; + line-height: 14px; vertical-align: text-top; - background-image: url(../img/glyphicons-halflings.png); + background-image: url("../img/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; *margin-right: .3em; @@ -1132,7 +1133,7 @@ table .span12 { *margin-left: 0; } .icon-white { - background-image: url(../img/glyphicons-halflings-white.png); + background-image: url("../img/glyphicons-halflings-white.png"); } .icon-glass { background-position: 0 0; @@ -1733,7 +1734,7 @@ table .span12 { -moz-border-radius: 5px; border-radius: 5px; } -.btn-large .icon { +.btn-large [class^="icon-"] { margin-top: 1px; } .btn-small { @@ -1741,7 +1742,7 @@ table .span12 { font-size: 11px; line-height: 16px; } -.btn-small .icon { +.btn-small [class^="icon-"] { margin-top: -1px; } .btn-primary, diff --git a/less/buttons.less b/less/buttons.less index 582350386..61d0bc7bf 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -76,7 +76,7 @@ line-height: normal; .border-radius(5px); } -.btn-large .icon { +.btn-large [class^="icon-"] { margin-top: 1px; } @@ -86,7 +86,7 @@ font-size: @baseFontSize - 2px; line-height: @baseLineHeight - 2px; } -.btn-small .icon { +.btn-small [class^="icon-"] { margin-top: -1px; } diff --git a/less/sprites.less b/less/sprites.less index 921c662d7..ce7668844 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -18,15 +18,16 @@ display: inline-block; width: 14px; height: 14px; + line-height: 14px; vertical-align: text-top; - background-image: url(../img/glyphicons-halflings.png); + background-image: url(@iconSpritePath); background-position: 14px 14px; background-repeat: no-repeat; .ie7-restore-right-whitespace(); } .icon-white { - background-image: url(../img/glyphicons-halflings-white.png); + background-image: url(@iconWhiteSpritePath); } .icon-glass { background-position: 0 0; } diff --git a/less/variables.less b/less/variables.less index f01c232e4..9f58d730e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -47,15 +47,19 @@ // Z-index master list // Used for a bird's eye view of components dependent on the z-axis // Try to avoid customizing these :) -@zindexDropdown: 1000; -@zindexPopover: 1010; -@zindexTooltip: 1020; -@zindexFixedNavbar: 1030; -@zindexModalBackdrop: 1040; -@zindexModal: 1050; +@zindexDropdown: 1000; +@zindexPopover: 1010; +@zindexTooltip: 1020; +@zindexFixedNavbar: 1030; +@zindexModalBackdrop: 1040; +@zindexModal: 1050; + +// Sprite icons path +@iconSpritePath: "../img/glyphicons-halflings.png"; +@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; // Input placeholder text color -@placeholderText: @grayLight; +@placeholderText: @grayLight; // Navbar @navbarHeight: 40px; -- cgit v1.2.3 From 468688638d69e23141ec4abda074a36e888c12c7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:23:20 -0800 Subject: #1715: strip code of styles when in a pre --- docs/assets/bootstrap.zip | Bin 52391 -> 52410 bytes docs/assets/css/bootstrap.css | 2 ++ less/code.less | 2 ++ 3 files changed, 4 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1ebcf34ce..3656b6fd3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 459e207b7..d51e3d6f9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -494,7 +494,9 @@ pre.prettyprint { } pre code { padding: 0; + color: inherit; background-color: transparent; + border: 0; } form { margin: 0 0 18px; diff --git a/less/code.less b/less/code.less index 0cc3db857..e75cfa00d 100644 --- a/less/code.less +++ b/less/code.less @@ -39,6 +39,8 @@ pre { // Account for some code outputs that place code tags in pre tags code { padding: 0; + color: inherit; background-color: transparent; + border: 0; } } -- cgit v1.2.3 From b297a61f82e567a5dccb99d1a01d46c5d8329e95 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:31:09 -0800 Subject: #1732: make examples of alerts in docs components page dismissable --- docs/assets/bootstrap.zip | Bin 52410 -> 52410 bytes docs/components.html | 14 +++++++------- docs/templates/pages/components.mustache | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3656b6fd3..d4b01e1ad 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index bd2e437a5..1d3971c06 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1294,24 +1294,24 @@

            Example alerts

            Wrap your message and an optional close icon in a div with simple class.

            - × + × Warning! Best check yo self, you're not looking too good. 
             <div class="alert">
-  <a class="close">×</a>
+  <a class="close data-dismiss="alert"gt;×</a>
   <strong>Warning!</strong> Best check yo self, you're not looking too good.
 </div>

            Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.

            - × + ×

            Warning!

            Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

             <div class="alert alert-block">
-  <a class="close">×</a>
+  <a class="close" data-dismiss="alert">×</a>
   <h4 class="alert-heading">Warning!</h4>
   Best check yo self, you're not...
 </div>
@@ -1324,7 +1324,7 @@
     
            
       
            Error or danger
            
       
            
-        ×
+        ×
         Oh snap! Change a few things up and try submitting again.
       
            
 
            @@ -1336,7 +1336,7 @@
     
            
       
            Success
            
       
            
-        ×
+        ×
         Well done! You successfully read this important alert message.
       
            
 
            @@ -1348,7 +1348,7 @@
     
            
       
            Information
            
       
            
-        ×
+        ×
         Heads up! This alert needs your attention, but it's not super important.
       
            
 
            diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 1f726c35a..466a8a2e5 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1218,24 +1218,24 @@
       
            {{_i}}Example alerts{{/i}}
            
       
            {{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}
            
       
            
-        ×
+        ×
         {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}}
       
            
 
             <div class="alert">
-  <a class="close">×</a>
+  <a class="close data-dismiss="alert"gt;×</a>
   <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
 </div>
 
            
       
            {{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/i}}
            
       
            
-        ×
+        ×
         
            {{_i}}Warning!{{/i}}
            
         
            {{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
            
       
            
 
             <div class="alert alert-block">
-  <a class="close">×</a>
+  <a class="close" data-dismiss="alert">×</a>
   <h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
   {{_i}}Best check yo self, you're not...{{/i}}
 </div>
@@ -1248,7 +1248,7 @@
     
            
       
            {{_i}}Error or danger{{/i}}
            
       
            
-        ×
+        ×
         {{_i}}Oh snap!{{/i}} {{_i}}Change a few things up and try submitting again.{{/i}}
       
            
 
            @@ -1260,7 +1260,7 @@
     
            
       
            {{_i}}Success{{/i}}
            
       
            
-        ×
+        ×
         {{_i}}Well done!{{/i}} {{_i}}You successfully read this important alert message.{{/i}}
       
            
 
            @@ -1272,7 +1272,7 @@
     
            
       
            {{_i}}Information{{/i}}
            
       
            
-        ×
+        ×
         {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it's not super important.{{/i}}
       
            
 
            -- 
cgit v1.2.3


From 6d8ac203e5b07a116336e172e9e1ebdb9ad76c33 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:32:04 -0800
Subject: fix broken alert example with data-dismiss

---
 docs/assets/bootstrap.zip                | Bin 52410 -> 52410 bytes
 docs/components.html                     |   2 +-
 docs/templates/pages/components.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d4b01e1ad..7295b9caa 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 1d3971c06..f96134040 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1299,7 +1299,7 @@
       
            
 
             <div class="alert">
-  <a class="close data-dismiss="alert"gt;×</a>
+  <a class="close" data-dismiss="alert">×</a>
   <strong>Warning!</strong> Best check yo self, you're not looking too good.
 </div>
 
            
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 466a8a2e5..1bf6b11d4 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1223,7 +1223,7 @@
       
            
 
             <div class="alert">
-  <a class="close data-dismiss="alert"gt;×</a>
+  <a class="close" data-dismiss="alert">×</a>
   <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
 </div>
 
            
-- 
cgit v1.2.3


From 679cd5ea02ca83d9c3755d6ac74f4a0bacd02897 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:38:49 -0800
Subject: #1706: protocol independent html5shim added, and moved after the CSS
 for loading time's sake

---
 docs/assets/bootstrap.zip      | Bin 52410 -> 52410 bytes
 docs/base-css.html             |  10 +++++-----
 docs/components.html           |  10 +++++-----
 docs/download.html             |  10 +++++-----
 docs/examples.html             |  10 +++++-----
 docs/index.html                |  10 +++++-----
 docs/javascript.html           |  10 +++++-----
 docs/less.html                 |  10 +++++-----
 docs/scaffolding.html          |  10 +++++-----
 docs/templates/layout.mustache |  10 +++++-----
 docs/upgrading.html            |  10 +++++-----
 11 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7295b9caa..842661748 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 48f042417..1e9f6e8c4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/components.html b/docs/components.html
index f96134040..f0559e5fa 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/download.html b/docs/download.html
index 1765b8a7d..8442dcad1 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/examples.html b/docs/examples.html
index 42faf93c0..aabd65b46 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/index.html b/docs/index.html
index 51da2a55f..180a1211b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/javascript.html b/docs/javascript.html
index 8d44fa03d..7ffb96cff 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/less.html b/docs/less.html
index 0eb5211d3..92b9099f5 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 25c394458..9819846a8 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 5f49bb62a..a885b25be 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 456afe6a5..ad3236f2b 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
-- 
cgit v1.2.3


From 87a8c9b677bff0d831f920922c86d5b0cff9949c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:40:50 -0800
Subject: #1707: remove rgba() background override on navbar active items for
 customization

---
 docs/assets/bootstrap.zip     | Bin 52410 -> 52391 bytes
 docs/assets/css/bootstrap.css |   1 -
 less/navbar.less              |   1 -
 3 files changed, 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 842661748..feedf5997 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d51e3d6f9..6bbed834b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2550,7 +2550,6 @@ button.btn.small, input[type="submit"].btn.small {
   color: #ffffff;
   text-decoration: none;
   background-color: #222222;
-  background-color: rgba(0, 0, 0, 0.5);
 }
 .navbar .divider-vertical {
   height: 40px;
diff --git a/less/navbar.less b/less/navbar.less
index 93c0400b6..3ad2a0743 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -205,7 +205,6 @@
   color: @navbarLinkColorHover;
   text-decoration: none;
   background-color: @navbarBackground;
-  background-color: rgba(0,0,0,.5);
 }
 
 // Dividers (basically a vertical hr)
-- 
cgit v1.2.3


From 418bf5221a70440aeecffe9ad9006b444aaf1747 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:50:26 -0800
Subject: #1712: fix typo in js docs

---
 docs/assets/bootstrap.zip                | Bin 52391 -> 52391 bytes
 docs/javascript.html                     |   2 +-
 docs/templates/pages/javascript.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index feedf5997..3f20466dc 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index 7ffb96cff..5d505eb4f 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1422,7 +1422,7 @@ $('.myCarousel').carousel({
 
            
           
            Methods
            
           
            .typeahead(options)
            
-          
            Initializes an input with a typahead.
            
+          
            Initializes an input with a typeahead.
            
         
            
       
            
     
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 29632a090..67bc83a1c 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1346,7 +1346,7 @@ $('.myCarousel').carousel({
 
            
           
            {{_i}}Methods{{/i}}
            
           
            .typeahead({{_i}}options{{/i}})
            
-          
            {{_i}}Initializes an input with a typahead.{{/i}}
            
+          
            {{_i}}Initializes an input with a typeahead.{{/i}}
            
         
            
       
            
     
\ No newline at end of file
-- 
cgit v1.2.3


From 35fdddbc4fdd134953ce2b1e4a88047850aa47a0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:55:47 -0800
Subject: correct css selector for .control-label, required in the docs but not
 in the CSS files

---
 docs/assets/bootstrap.zip     | Bin 52391 -> 52391 bytes
 docs/assets/css/bootstrap.css |   2 +-
 less/forms.less               |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3f20466dc..f35f984ce 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6bbed834b..f954835b2 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -977,7 +977,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .form-horizontal .control-group:after {
   clear: both;
 }
-.form-horizontal .control-group > label {
+.form-horizontal .control-label {
   float: left;
   width: 140px;
   padding-top: 5px;
diff --git a/less/forms.less b/less/forms.less
index 31442fa36..48f80396e 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -503,7 +503,7 @@ select:focus:required:invalid {
     .clearfix();
   }
   // Float the labels left
-  .control-group > label {
+  .control-label {
     float: left;
     width: 140px;
     padding-top: 5px;
-- 
cgit v1.2.3


From 93fea1f1cf7902261a3743acadd9bb2a196e2190 Mon Sep 17 00:00:00 2001
From: Chris Rebert 
Date: Sat, 4 Feb 2012 23:21:56 -0800
Subject: The < and > escapes have nothing to do with Unicode.

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

diff --git a/docs/base-css.html b/docs/base-css.html
index 1e9f6e8c4..c37db8884 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -375,7 +375,7 @@ For example, <code>section</code> should be wrapped as inline.

        Basic block

        -

        Use <pre> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.

        +

        Use <pre> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.

         <p>Sample text here...</p>
        -- cgit v1.2.3 From a2848ebb0000f3dbe9ba29ec91713bef072b1668 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 23:53:24 -0800 Subject: fix meta tag for viewport in examples and shims --- docs/examples/fluid.html | 11 ++++++----- docs/examples/hero.html | 11 ++++++----- docs/examples/starter-template.html | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index 7fe5df151..3c7059f9d 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -3,14 +3,10 @@ Bootstrap, from Twitter + - - - + + + diff --git a/docs/examples/hero.html b/docs/examples/hero.html index 7d60d1a48..ee64646f3 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -3,14 +3,10 @@ Bootstrap, from Twitter + - - - + + + diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html index c8b2a09cf..31cc57cf8 100644 --- a/docs/examples/starter-template.html +++ b/docs/examples/starter-template.html @@ -3,14 +3,10 @@ Bootstrap, from Twitter + - - - + + + -- cgit v1.2.3 From 125368d4db04fa5b2300975ed2ba59983309ee0f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 23:57:15 -0800 Subject: update docs with call on meta tag for responsive --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/scaffolding.html | 4 ++++ docs/templates/pages/scaffolding.mustache | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f35f984ce..99ff15c06 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 9819846a8..b8dc42664 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -357,6 +357,10 @@ +

        Requires meta tag

        +

        To ensure devices display responsive pages properly, include the viewport meta tag.

        + 
        <meta name="viewport" content="width=device-width, initial-scale=1.0">
        +

        What they do

        Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.

          diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index ba2076f31..c81f2e535 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -281,6 +281,10 @@ +

          {{_i}}Requires meta tag{{/i}}

          +

          {{_i}}To ensure devices display responsive pages properly, include the viewport meta tag.{{/i}}

          + 
          <meta name="viewport" content="width=device-width, initial-scale=1.0">
          +

          {{_i}}What they do{{/i}}

          {{_i}}Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.{{/i}}

            -- cgit v1.2.3 From 31abeec0f2d84b3861d0c80c56c3112546bf0bfd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:05:01 -0800 Subject: manually handle #1703 for note on horizontal forms --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/templates/pages/upgrading.mustache | 1 + docs/upgrading.html | 1 + 3 files changed, 2 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 99ff15c06..d43ca5f9a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index d92cc04dd..56b0d4bf7 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -82,6 +82,7 @@
          • {{_i}}Default form style is now vertical (stacked) to use less CSS and add greater flexibility{{/i}}
          • {{_i}}Form classes standardized with .form- required as a prefix{{/i}}
          • {{_i}}New built-in form defaults for search, inline, and horizontal forms{{/i}}
            • +
          • {{_i}}For horizontal forms, previous classes .clearfix and .input are equivalent to the new .control-group and .controls.{{/i}}
          • {{_i}}More flexible horizontal form markup with classes for all styling, including new optional class for the label{{/i}}
          • {{_i}}Form states: colors updated and customizable via new LESS variables{{/i}}
          diff --git a/docs/upgrading.html b/docs/upgrading.html index ad3236f2b..5a7b0d2f6 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -158,6 +158,7 @@
        • Default form style is now vertical (stacked) to use less CSS and add greater flexibility
        • Form classes standardized with .form- required as a prefix
        • New built-in form defaults for search, inline, and horizontal forms
          • +
        • For horizontal forms, previous classes .clearfix and .input are equivalent to the new .control-group and .controls.
        • More flexible horizontal form markup with classes for all styling, including new optional class for the label
        • Form states: colors updated and customizable via new LESS variables
        -- cgit v1.2.3 From cdb1ad1a52a9f55c63003b7b62ef8b1e9c6fcfaf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:11:21 -0800 Subject: #1702: add callout to navbar for component alignment --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/components.html | 2 ++ docs/templates/pages/components.mustache | 2 ++ 3 files changed, 4 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d43ca5f9a..3c655b03a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index f0559e5fa..1c5bc5abe 100644 --- a/docs/components.html +++ b/docs/components.html @@ -864,6 +864,8 @@ <li><a href="#">Link</a></li> </ul> +

        Component alignment

        +

        To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.

        Adding dropdowns

        Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.

        diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 1bf6b11d4..1f466aa5d 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -788,6 +788,8 @@
   <li><a href="#">{{_i}}Link{{/i}}</a></li>
 </ul>
        +

        {{_i}}Component alignment{{/i}}

        +

        {{_i}}To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

        {{_i}}Adding dropdowns{{/i}}

        {{_i}}Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.{{/i}}

        -- 
cgit v1.2.3


From f29e3263b04fd2ecbd42e864e03abc15439b4a1b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 00:16:25 -0800
Subject: follow up to #1702, add callout on component alignment in tabs/pills

---
 docs/assets/bootstrap.zip                | Bin 52391 -> 52391 bytes
 docs/components.html                     |   7 ++++---
 docs/templates/pages/components.mustache |   7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3c655b03a..d3f2da9ad 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 1c5bc5abe..06ca2560c 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -354,9 +354,10 @@
     
        
       
        Powerful base class
        
       
        All nav components here—tabs, pills, and lists—share the same base markup and styles through the .nav class.
        
-      
        Why tabs and pills
        
-      
        Tabs and pills in Bootstrap are built on a <ul> with the same core HTML, a list of links. Swap between tabs or pills with only a class.
        
-      
        Both options are great for sub-sections of content or navigating between pages of related content.
        
+      
        When to use
        
+      
        Tabs and pills are great for sections of content or navigating between pages of related content.
        
+      
        Component alignment
        
+      
        To align nav links, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.
        
     
        
     
        
       
        Basic tabs
        
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 1f466aa5d..0a7affafe 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -278,9 +278,10 @@
     
        
       
        {{_i}}Powerful base class{{/i}}
        
       
        {{_i}}All nav components here—tabs, pills, and lists—share the same base markup and styles through the .nav class.{{/i}}
        
-      
        {{_i}}Why tabs and pills{{/i}}
        
-      
        {{_i}}Tabs and pills in Bootstrap are built on a <ul> with the same core HTML, a list of links. Swap between tabs or pills with only a class.{{/i}}
        
-      
        {{_i}}Both options are great for sub-sections of content or navigating between pages of related content.{{/i}}
        
+      
        {{_i}}When to use{{/i}}
        
+      
        {{_i}}Tabs and pills are great for sections of content or navigating between pages of related content.{{/i}}
        
+      
        {{_i}}Component alignment{{/i}}
        
+      
        {{_i}}To align nav links, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}
        
     
        
     
        
       
        {{_i}}Basic tabs{{/i}}
        
-- 
cgit v1.2.3


From dfcb2d1ed83e2c1bc76b4646ba28dccae4205d08 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 00:25:40 -0800
Subject: #1697: update upgrading docs to include mention of no more secondary
 class in modals

---
 docs/assets/bootstrap.zip               | Bin 52391 -> 52391 bytes
 docs/templates/pages/upgrading.mustache |   1 +
 docs/upgrading.html                     |   1 +
 3 files changed, 2 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d3f2da9ad..5e37b7d983 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 56b0d4bf7..23a53da0e 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -76,6 +76,7 @@
     
      • {{_i}}IE9: removed gradients and added rounded corners{{/i}}
        • 
     
      • {{_i}}Updated active state to make styling clearer in button groups (new) and look better with custom transition{{/i}}
        • 
     
      • {{_i}}New mixin, .buttonBackground, to set button gradients{{/i}}
        • 
+    
      • {{_i}}The .secondary class was removed from modal examples in our docs as it never had associated styles.{{/i}}
        •

      {{_i}}Forms{{/i}}

        diff --git a/docs/upgrading.html b/docs/upgrading.html index 5a7b0d2f6..39da8e1f7 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -152,6 +152,7 @@
      • IE9: removed gradients and added rounded corners
      • Updated active state to make styling clearer in button groups (new) and look better with custom transition
      • New mixin, .buttonBackground, to set button gradients
        • +
      • The .secondary class was removed from modal examples in our docs as it never had associated styles.

      Forms

        -- cgit v1.2.3 From 0336f1e644b2b2e76bf797aab6d26644c41de897 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:27:08 -0800 Subject: #1695: manually fix broken primary button instances --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/components.html | 4 ++-- docs/templates/pages/components.mustache | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 5e37b7d983..2c140266b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index 06ca2560c..67fe16f13 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1171,7 +1171,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.

        -

        Action Action

        +

        Action Action

        @@ -1181,7 +1181,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.

        -

        Action Action

        +

        Action Action

        diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 0a7affafe..6be6cd601 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1095,7 +1095,7 @@
        {{_i}}Thumbnail label{{/i}}

        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.

        -

        {{_i}}Action{{/i}} {{_i}}Action{{/i}}

        +

        {{_i}}Action{{/i}} {{_i}}Action{{/i}}

        @@ -1105,7 +1105,7 @@
        {{_i}}Thumbnail label{{/i}}

        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.

        -

        {{_i}}Action{{/i}} {{_i}}Action{{/i}}

        +

        {{_i}}Action{{/i}} {{_i}}Action{{/i}}

        -- cgit v1.2.3 From 6661639b37a6e577c4795e4394a0f0b6b75f4a01 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:29:19 -0800 Subject: #1693: manual fix of the pull request to add class name changes to pills/tabs to upgrade guide --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/templates/pages/upgrading.mustache | 2 +- docs/upgrading.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 2c140266b..0a56f52fd 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index 23a53da0e..45ab0703b 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -111,7 +111,7 @@

      {{_i}}Navigation{{/i}}

        -
      • {{_i}}Tabs and pills now require the use of a new base class, .nav, on their <ul>{{/i}}
        • +
      • {{_i}}Tabs and pills now require the use of a new base class, .nav, on their <ul> and the class names are now .nav-pills and .nav-tabs.{{/i}}
      • {{_i}}New nav list variation added that uses the same base class, .nav{{/i}}
      • {{_i}}Vertical tabs and pills have been added—just add .nav-stacked to the <ul>{{/i}}
      • {{_i}}Pills were restyled to be less rounded by default{{/i}}
        • diff --git a/docs/upgrading.html b/docs/upgrading.html index 39da8e1f7..47cac06dc 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -187,7 +187,7 @@

      Navigation

        -
      • Tabs and pills now require the use of a new base class, .nav, on their <ul>
        • +
      • Tabs and pills now require the use of a new base class, .nav, on their <ul> and the class names are now .nav-pills and .nav-tabs.
      • New nav list variation added that uses the same base class, .nav
      • Vertical tabs and pills have been added—just add .nav-stacked to the <ul>
      • Pills were restyled to be less rounded by default
        • -- cgit v1.2.3 From 2f42f35c69da66709247c2830935479dc97061a4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:35:13 -0800 Subject: manually resolve #1684 --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/index.html | 2 +- docs/templates/pages/index.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 0a56f52fd..32afa3a02 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/index.html b/docs/index.html index 180a1211b..95661da41 100644 --- a/docs/index.html +++ b/docs/index.html @@ -121,7 +121,7 @@

        For all skill levels

        -

        Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.

        +

        Bootstrap is designed to help people of all skill levels—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.

        diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 9fee412a5..c95e85362 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -45,7 +45,7 @@

        {{_i}}For all skill levels{{/i}}

        -

        {{_i}}Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.{{/i}}

        +

        {{_i}}Bootstrap is designed to help people of all skill levels—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.{{/i}}

        -- cgit v1.2.3 From 83cb1053178241d95b0f53da062a4b742d0313cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:36:11 -0800 Subject: adding code snippets to form examples --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/base-css.html | 29 ++++++++++++++++++++++++++--- docs/templates/pages/base-css.mustache | 30 +++++++++++++++++++++++++++--- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 91279e1ac..0700910d3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index 7f409e019..f84cbe774 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -852,9 +852,9 @@ For example, <code>section</code> should be wrapped as inline.

        Example forms using just form controls, no extra markup

        -

        Basic form

        +

        Basic form

        With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.

        @@ -866,11 +866,21 @@ For example, <code>section</code> should be wrapped as inline. +
        +<form class="well">
+  <label>Label name</label>
+  <input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span>
+  <label class="checkbox">
+    <input type="checkbox"> Check me out
+  </label>
+  <button type="submit" class="btn">Submit</button>
+</form>
+
        -

        Search form

        +

        Search form

        Reflecting default WebKit styles, just add .form-search for extra rounded search fields.

        @@ -878,11 +888,17 @@ For example, <code>section</code> should be wrapped as inline. +
        +<form class="well form-search">
+  <input type="text" class="input-medium search-query">
+  <button type="submit" class="btn">Search</button>
+</form>
+
        -

        Inline form

        +

        Inline form

        Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.

        @@ -891,6 +907,13 @@ For example, <code>section</code> should be wrapped as inline. +
        +<form class="well form-inline">
+  <input type="text" class="input-small" placeholder="Email">
+  <input type="password" class="input-small" placeholder="Password">
+  <button type="submit" class="btn">Go</button>
+</form>
+
        diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 443d5ca92..3327594b5 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -776,9 +776,9 @@

        {{_i}}Example forms using just form controls, no extra markup{{/i}}

        -

        {{_i}}Basic form{{/i}}

        +

        {{_i}}Basic form{{/i}}

        {{_i}}With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.{{/i}}

        @@ -790,11 +790,22 @@ +
        +<form class="well">
+  <label>{{_i}}Label name{{/i}}</label>
+  <input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}">
+  <span class="help-inline">Associated help text!</span>
+  <label class="checkbox">
+    <input type="checkbox"> {{_i}}Check me out{{/i}}
+  </label>
+  <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
+</form>
+
        -

        {{_i}}Search form{{/i}}

        +

        {{_i}}Search form{{/i}}

        {{_i}}Reflecting default WebKit styles, just add .form-search for extra rounded search fields.{{/i}}

        @@ -802,11 +813,17 @@ +
        +<form class="well form-search">
+  <input type="text" class="input-medium search-query">
+  <button type="submit" class="btn">{{_i}}Search{{/i}}</button>
+</form>
+
        -

        {{_i}}Inline form{{/i}}

        +

        {{_i}}Inline form{{/i}}

        {{_i}}Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.{{/i}}

        @@ -815,6 +832,13 @@ +
        +<form class="well form-inline">
+  <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
+  <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
+  <button type="submit" class="btn">{{_i}}Go{{/i}}</button>
+</form>
+
        -- cgit v1.2.3 From abf4ecac4dbd378a4985880e27f2897ebca75e7b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:41:45 -0800 Subject: add another code example for horizontal forms --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/base-css.html | 19 ++++++++++++++++++- docs/templates/pages/base-css.mustache | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 0700910d3..d55ce3f0d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index f84cbe774..22025bbb2 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -869,7 +869,8 @@ For example, <code>section</code> should be wrapped as inline. 
         <form class="well">
   <label>Label name</label>
-  <input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span>
+  <input type="text" class="span3" placeholder="Type something…">
+  <span class="help-inline">Associated help text!</span>
   <label class="checkbox">
     <input type="checkbox"> Check me out
   </label>
@@ -983,6 +984,22 @@ For example, <code>section</code> should be wrapped as inline.
        +

        Example markup

        +

        Given the above example form layout, here's the markup associated with the first input and control group.

        +
        +<form class="form-horizontal">
+  <fieldset>
+    <legend>Legend text</legend>
+    <div class="control-group">
+      <label class="control-label" for="input01">Text input</label>
+      <div class="controls">
+        <input type="text" class="input-xlarge" id="input01">
+        <p class="help-block">Supporting help text</p>
+      </div>
+    </div>
+  </fieldset>
+</form>
+

        What's included

        diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 3327594b5..e3420ed09 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -908,6 +908,22 @@
        +

        {{_i}}Example markup{{/i}}

        +

        {{_i}}Given the above example form layout, here's the markup associated with the first input and control group.{{/i}}

        +
        +<form class="form-horizontal">
+  <fieldset>
+    <legend>{{_i}}Legend text{{/i}}</legend>
+    <div class="control-group">
+      <label class="control-label" for="input01">{{_i}}Text input{{/i}}</label>
+      <div class="controls">
+        <input type="text" class="input-xlarge" id="input01">
+        <p class="help-block">{{_i}}Supporting help text{{/i}}</p>
+      </div>
+    </div>
+  </fieldset>
+</form>
+

        {{_i}}What's included{{/i}}

        -- cgit v1.2.3 From f59b7ce8ea0051287488ff2119dc29a066429eaa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:43:22 -0800 Subject: add mention of required classes to horizontal forms --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/base-css.html | 2 +- docs/templates/pages/base-css.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d55ce3f0d..d066288f0 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index 22025bbb2..b345a8434 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -985,7 +985,7 @@ For example, <code>section</code> should be wrapped as inline.

        Example markup

        -

        Given the above example form layout, here's the markup associated with the first input and control group.

        +

        Given the above example form layout, here's the markup associated with the first input and control group. The .control-group, .control-label, and .controls classes are all required for styling.

         <form class="form-horizontal">
   <fieldset>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index e3420ed09..c23444a07 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -909,7 +909,7 @@
         
       
       
        {{_i}}Example markup{{/i}}
        
-      
        {{_i}}Given the above example form layout, here's the markup associated with the first input and control group.{{/i}}
        
+      
        {{_i}}Given the above example form layout, here's the markup associated with the first input and control group. The .control-group, .control-label, and .controls classes are all required for styling.{{/i}}
        
 
         <form class="form-horizontal">
   <fieldset>
-- 
cgit v1.2.3


From 53da88e561abf4a5802188ff1901e6915b85c18b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 01:49:36 -0800
Subject: add mixin for text-overflow

---
 docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes
 less/mixins.less          |   9 +++++++++
 2 files changed, 9 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d066288f0..0376cba14 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/less/mixins.less b/less/mixins.less
index 545ccb9ba..95292a6f2 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -89,6 +89,15 @@
   }
 }
 
+// Text overflow
+// -------------------------
+// Requires inline-block or block for proper styling
+.text-overflow() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 
 
 // FONTS
-- 
cgit v1.2.3


From ff91b233eb51da94451114f45e276ba325f67479 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 01:50:55 -0800
Subject: fix #1665 by correcting tabs example markup

---
 docs/assets/bootstrap.zip                | Bin 52391 -> 52391 bytes
 docs/javascript.html                     |   4 ++--
 docs/templates/pages/javascript.mustache |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0376cba14..bd95672ef 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index e3e274b2f..b6abe80ea 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -624,7 +624,7 @@ $('#myModal').on('hidden', function () {
           
        Markup
        
           
        You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.
        
 
        -<ul class="tabs">
+<ul class="nav nav-tabs">
   <li><a href="#home" data-toggle="tab">Home</a></li>
   <li><a href="#profile" data-toggle="tab">Profile</a></li>
   <li><a href="#messages" data-toggle="tab">Messages</a></li>
@@ -636,7 +636,7 @@ $('#myModal').on('hidden', function () {
             Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
           
        
 
        -<ul class="tabs">
+<ul class="nav nav-tabs">
   <li class="active"><a href="#home">Home</a></li>
   <li><a href="#profile">Profile</a></li>
   <li><a href="#messages">Messages</a></li>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 9850335c4..006461290 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -548,7 +548,7 @@ $('#myModal').on('hidden', function () {
           
        {{_i}}Markup{{/i}}
        
           
        {{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.{{/i}}
        
 
        -<ul class="tabs">
+<ul class="nav nav-tabs">
   <li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
   <li><a href="#profile" data-toggle="tab">{{_i}}Profile{{/i}}</a></li>
   <li><a href="#messages" data-toggle="tab">{{_i}}Messages{{/i}}</a></li>
@@ -560,7 +560,7 @@ $('#myModal').on('hidden', function () {
             {{_i}}Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.{{/i}}
           
        
 
        -<ul class="tabs">
+<ul class="nav nav-tabs">
   <li class="active"><a href="#home">{{_i}}Home{{/i}}</a></li>
   <li><a href="#profile">{{_i}}Profile{{/i}}</a></li>
   <li><a href="#messages">{{_i}}Messages{{/i}}</a></li>
-- 
cgit v1.2.3


From d92523f3299c751d77ea43893fa39bbb687a5f80 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 01:57:09 -0800
Subject: fix for #1658 to give .label-success proper text

---
 docs/assets/bootstrap.zip                | Bin 52391 -> 52391 bytes
 docs/components.html                     |   2 +-
 docs/templates/pages/components.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index bd95672ef..09a3b9cb6 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 67fe16f13..2a31528ea 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1094,7 +1094,7 @@
           Success
         
         
-          <span class="label label-success">New</span>
+          <span class="label label-success">Success</span>
         
       
       
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 6be6cd601..226283004 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1018,7 +1018,7 @@
           {{_i}}Success{{/i}}
         
         
-          <span class="label label-success">{{/_i}}New{{/i}}</span>
+          <span class="label label-success">{{/_i}}Success{{/i}}</span>
         
       
       
-- 
cgit v1.2.3


From 2a192468d311289e9e219cf8cbe3047da4aa3381 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 01:59:16 -0800
Subject: address #1722 by finishing incomplete sentence on responsive

---
 docs/assets/bootstrap.zip                 | Bin 52391 -> 52391 bytes
 docs/scaffolding.html                     |   2 +-
 docs/templates/pages/scaffolding.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 09a3b9cb6..8f8bd1c91 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b8dc42664..dc20961dc 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -381,7 +381,7 @@
       
          
         
        1. Use the compiled responsive version, bootstrap-responsive.css
          2. 
         
        2. Add @import "responsive.less" and recompile Bootstrap
          3. 
-        
        3. Modify and recompile responsive.less as a separate
          4. 
+        
        4. Modify and recompile responsive.less as a separate file
          5. 
       
        
       
        Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.
        diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index c81f2e535..c0fa632e3 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -305,7 +305,7 @@
        1. {{_i}}Use the compiled responsive version, bootstrap-responsive.css{{/i}}
        2. {{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}
          3. -
        3. {{_i}}Modify and recompile responsive.less as a separate{{/i}}
          4. +
        4. {{_i}}Modify and recompile responsive.less as a separate file{{/i}}

        {{_i}}Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.{{/i}}

        -- cgit v1.2.3 From 4a09cf04d8d644734f91c9a9ce97091ad698fcce Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:01:28 -0800 Subject: clean up labels per #1656 --- docs/assets/bootstrap.zip | Bin 52391 -> 52395 bytes docs/assets/css/bootstrap.css | 6 +++--- less/labels.less | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8f8bd1c91..78b660d7f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f954835b2..2da793c7f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3050,11 +3050,11 @@ a.thumbnail:hover { padding: 9px; } .label { - padding: 1px 3px 2px; - font-size: 9.75px; + padding: 2px 4px 3px; + font-size: 11.049999999999999px; font-weight: bold; color: #ffffff; - text-transform: uppercase; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #999999; -webkit-border-radius: 3px; -moz-border-radius: 3px; diff --git a/less/labels.less b/less/labels.less index c0f427750..fbd192253 100644 --- a/less/labels.less +++ b/less/labels.less @@ -2,11 +2,11 @@ // ------ .label { - padding: 1px 3px 2px; - font-size: @baseFontSize * .75; + padding: 2px 4px 3px; + font-size: @baseFontSize * .85; font-weight: bold; color: @white; - text-transform: uppercase; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); background-color: @grayLight; .border-radius(3px); } -- cgit v1.2.3 From 91475c865dd8fe224c574c1a15e8949fccdda8c0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:14:25 -0800 Subject: fix #1631 by adding focus to radio buttons --- docs/assets/bootstrap.zip | Bin 52395 -> 52404 bytes docs/assets/css/bootstrap.css | 5 ++++- less/forms.less | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 78b660d7f..14e74c301 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2da793c7f..12b9af84d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -654,7 +654,10 @@ input:focus, textarea:focus { /* IE6-8 */ } -input[type="file"]:focus, input[type="checkbox"]:focus, select:focus { +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus, +select:focus { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; diff --git a/less/forms.less b/less/forms.less index 48f80396e..a8de0f24c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -202,6 +202,7 @@ textarea:focus { outline: thin dotted \9; /* IE6-8 */ } input[type="file"]:focus, +input[type="radio"]:focus, input[type="checkbox"]:focus, select:focus { .box-shadow(none); // override for file inputs -- cgit v1.2.3 From 59b32586af807d0e4f2985ef6e927e32d8ae2df5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:16:46 -0800 Subject: close #1628 to add padding to all inline checkboxes/radios --- docs/assets/bootstrap.zip | Bin 52404 -> 52385 bytes docs/assets/css/bootstrap.css | 4 +--- less/forms.less | 7 ++----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 14e74c301..bd2b6ffdb 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 12b9af84d..2674c48a6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -625,15 +625,13 @@ input[type="hidden"] { } .radio.inline, .checkbox.inline { display: inline-block; + padding-top: 5px; margin-bottom: 0; vertical-align: middle; } .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; } -.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { - padding-top: 0; -} 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); diff --git a/less/forms.less b/less/forms.less index a8de0f24c..3f68df01c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -166,9 +166,11 @@ input[type="hidden"] { } // Radios and checkboxes on same line +// TODO v3: Convert .inline to .control-inline .radio.inline, .checkbox.inline { display: inline-block; + padding-top: 5px; margin-bottom: 0; vertical-align: middle; } @@ -176,11 +178,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; // space out consecutive inline controls } -// But don't forget to remove their padding on first-child -.controls > .radio.inline:first-child, -.controls > .checkbox.inline:first-child { - padding-top: 0; -} -- cgit v1.2.3 From f8c2d9b53d0b3cfba1f7fbced88457f53d1dbbd6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:24:14 -0800 Subject: remove 940px from default grid heading --- docs/assets/bootstrap.zip | Bin 52385 -> 52385 bytes docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index bd2b6ffdb..8c304bc8b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index dc20961dc..b2962f317 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -97,7 +97,7 @@

        Grid system 12 columns with a responsive twist

        -

        Default 940px grid

        +

        Default grid

        1
        1
        diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index c0fa632e3..1694a052d 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -21,7 +21,7 @@

        {{_i}}Grid system 12 columns with a responsive twist{{/i}}

        -

        {{_i}}Default 940px grid{{/i}}

        +

        {{_i}}Default grid{{/i}}

        1
        1
        -- cgit v1.2.3 From 546332d85de5837147b645bf6bab5fa06e2a1039 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:28:42 -0800 Subject: resolve #1602 and add table hover style --- docs/assets/bootstrap.zip | Bin 52385 -> 52415 bytes docs/assets/css/bootstrap.css | 3 +++ less/tables.less | 10 ++++++++++ 3 files changed, 13 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8c304bc8b..f772cc9da 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2674c48a6..2f982b04a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1061,6 +1061,9 @@ table { .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { background-color: #f9f9f9; } +.table tbody tr:hover td, .table tbody tr:hover th { + background-color: #f5f5f5; +} table .span1 { float: none; width: 44px; diff --git a/less/tables.less b/less/tables.less index c069ed588..cbc013aca 100644 --- a/less/tables.less +++ b/less/tables.less @@ -113,6 +113,16 @@ table { } +// HOVER EFFECT +// ------------ +// Placed here since it has to come after the potential zebra striping +.table { + tbody tr:hover td, + tbody tr:hover th { + background-color: #f5f5f5; + } +} + // TABLE CELL SIZING // ----------------- -- cgit v1.2.3 From 85e401a6567e51016357acfe6b01cd5b5c330652 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:36:21 -0800 Subject: add label hover style for ability to make it a link --- docs/assets/bootstrap.zip | Bin 52415 -> 52500 bytes docs/assets/css/bootstrap.css | 16 ++++++++++++++++ less/labels.less | 20 ++++++++++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f772cc9da..c7a6d854c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2f982b04a..3833da611 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3064,18 +3064,34 @@ a.thumbnail:hover { -moz-border-radius: 3px; border-radius: 3px; } +.label:hover { + color: #ffffff; + text-decoration: none; +} .label-important { background-color: #b94a48; } +.label-important:hover { + background-color: #953b39; +} .label-warning { background-color: #f89406; } +.label-warning:hover { + background-color: #c67605; +} .label-success { background-color: #468847; } +.label-success:hover { + background-color: #356635; +} .label-info { background-color: #3a87ad; } +.label-info:hover { + background-color: #2d6987; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 0 0; diff --git a/less/labels.less b/less/labels.less index 6337d0e70..268435a0b 100644 --- a/less/labels.less +++ b/less/labels.less @@ -1,6 +1,7 @@ // LABELS // ------ +// Base .label { padding: 2px 4px 3px; font-size: @baseFontSize * .85; @@ -10,11 +11,22 @@ background-color: @grayLight; .border-radius(3px); } -.label-important { background-color: @errorText; } -.label-warning { background-color: @orange; } -.label-success { background-color: @successText; } -.label-info { background-color: @infoText; } + +// Hover state .label:hover { color: @white; text-decoration: none; } + +// Colors +.label-important { background-color: @errorText; } +.label-important:hover { background-color: darken(@errorText, 10%); } + +.label-warning { background-color: @orange; } +.label-warning:hover { background-color: darken(@orange, 10%); } + +.label-success { background-color: @successText; } +.label-success:hover { background-color: darken(@successText, 10%); } + +.label-info { background-color: @infoText; } +.label-info:hover { background-color: darken(@infoText, 10%); } -- cgit v1.2.3 From 8a8daca71e7c979cc2cac6392e9cf810428a0423 Mon Sep 17 00:00:00 2001 From: Aditya Panchal Date: Sun, 5 Feb 2012 22:04:46 -0600 Subject: Fixed a typo in base-css.html which allows the user icon to be shown on the example button --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/base-css.html b/docs/base-css.html index 60b6edfe1..1b8e3349f 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1495,7 +1495,7 @@ For example, <code>section</code> should be wrapped as inline.
        - User + User
        • Edit
          • -- cgit v1.2.3 From 98cffdbf4684a85565d6ca7cf1173319863d03fd Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 5 Feb 2012 23:02:16 -0800 Subject: parallel fix to mustache template --- docs/templates/pages/base-css.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index fd9a82f50..833e196ef 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -299,7 +299,7 @@

        Basic block

        -

        {{_i}}Use <pre> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.{{/i}}

        +

        {{_i}}Use <pre> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.{{/i}}

         <p>{{_i}}Sample text here...{{/i}}</p>
        -- cgit v1.2.3 From 9ba9185afc6a91d8047bb76654af429d7efba96b Mon Sep 17 00:00:00 2001 From: Torsten Baldes Date: Mon, 6 Feb 2012 09:59:23 +0100 Subject: Removed double declaration of Skew + added translate3d to mixins.less --- less/mixins.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/less/mixins.less b/less/mixins.less index 545ccb9ba..33def6488 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -313,12 +313,12 @@ -o-transform: translate(@x, @y); transform: translate(@x, @y); } -.skew(@x: 0, @y: 0) { - -webkit-transform: translate(@x, @y); - -moz-transform: translate(@x, @y); - -ms-transform: translate(@x, @y); - -o-transform: translate(@x, @y); - transform: translate(@x, @y); +.translate3d(@x: 0, @y: 0, @z: 0) { + -webkit-transform: translate(@x, @y, @z); + -moz-transform: translate(@x, @y, @z); + -ms-transform: translate(@x, @y, @z); + -o-transform: translate(@x, @y, @z); + transform: translate(@x, @y, @z); } .skew(@x: 0, @y: 0) { -webkit-transform: skew(@x, @y); -- cgit v1.2.3 From 7e92b33f12d8c5840aa746094f9566f0a0a1aaf8 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Mon, 6 Feb 2012 14:37:47 -0800 Subject: Adding tooltip example to javascript docs. It's particularly helpful to show the pre-generated HTML for tooltips, as inspecting the source will show post-processed HTML with data-original-title attributes and may confuse folks (where folks=me :). --- docs/templates/pages/javascript.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 57cb4eac4..c98e746c8 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -697,6 +697,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

        {{_i}}Markup{{/i}}

        {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

        +
        +<a href="#" rel="tooltip" title="first tooltip">{{_i}}hover over me{{/i}}</a>
+

        {{_i}}Methods{{/i}}

        $().tooltip({{_i}}options{{/i}})

        {{_i}}Attaches a tooltip handler to an element collection.{{/i}}

        -- cgit v1.2.3 From 3722bb9a88e95b37ded12cb40a67ac396ce140fd Mon Sep 17 00:00:00 2001 From: raphaelz Date: Tue, 7 Feb 2012 02:11:25 -0500 Subject: Grammatical changes have been made as suggested by @cvrebert for issue #1787. --- js/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/README.md b/js/README.md index b58fa1d40..3aa09c960 100644 --- a/js/README.md +++ b/js/README.md @@ -37,7 +37,7 @@ All methods should accept an optional options object, a string which targets a p Options should be sparse and add universal value. We should pick the right defaults. -All plugins should have a default object which can be modified to effect all instance's default options. The defaults object should be available via `$.fn.plugin.defaults`. +All plugins should have a default object which can be modified to affect all instances' default options. The defaults object should be available via `$.fn.plugin.defaults`. $.fn.modal.defaults = { … } @@ -64,7 +64,7 @@ All events should have an infinitive and past participle form. The infinitive is ### CONSTRUCTORS -Each plugin should expose it's raw constructor on a `Constructor` property -- accessed in the following way: +Each plugin should expose its raw constructor on a `Constructor` property -- accessed in the following way: $.fn.popover.Constructor -- cgit v1.2.3 From 575b82473f8d248ca3782fa86ce1c92eea03905c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:34:03 -0800 Subject: rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query --- docs/assets/bootstrap.zip | Bin 52500 -> 52518 bytes docs/assets/css/bootstrap-responsive.css | 2 +- docs/assets/css/bootstrap.css | 2 ++ docs/base-css.html | 41 +++++++++++++++++-------------- docs/templates/pages/base-css.mustache | 41 +++++++++++++++++-------------- less/buttons.less | 4 ++- less/responsive.less | 2 +- 7 files changed, 53 insertions(+), 39 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c7a6d854c..c474e5f0c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 4b032cdb5..4d464ea88 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -84,7 +84,7 @@ position: static; } } -@media (max-width: 768px) { +@media (max-width: 767px) { .container { width: auto; padding: 0 20px; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3833da611..188b97036 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1668,11 +1668,13 @@ table .span12 { .btn { display: inline-block; padding: 4px 10px 4px; + margin-bottom: 0; font-size: 13px; line-height: 18px; color: #333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + vertical-align: middle; background-color: #fafafa; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); diff --git a/docs/base-css.html b/docs/base-css.html index b345a8434..a7dcbff19 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1289,17 +1289,10 @@ For example, <code>section</code> should be wrapped as inline.

        Buttons for actions

        As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.

        +

        Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements.

        +

        Cross browser compatibility

        +

        IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.

        -
        -

        For anchors and forms

        -

        Button styles can be applied to anything with the .btn applied. However, typically you'll want to apply these to only <a> and <button> elements.

        -
        -
        -

        Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.

        -
        - - -

        Multiple sizes

        Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.

        @@ -1311,8 +1304,7 @@ For example, <code>section</code> should be wrapped as inline. Primary action Action

        -
        -
        +

        Disabled state

        For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.

        @@ -1325,14 +1317,27 @@ For example, <code>section</code> should be wrapped as inline.

        -

        Cross browser compatibility

        -

        In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.

        -

        Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow—unfortunately we can't fix this.

        +

        One class, multiple tags

        +

        Use the .btn class on an <a>, <button>, or <input> element.

        +
        +Link + + + +
        +
        +<a class="btn" href="">Link</a>
+<button class="btn" type="submit">
+  Button
+</button>
+<input class="btn" type="button" 
+         value="Input">
+<input class="btn" type="submit" 
+         value="Submit">
+
        +

        As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.

        - -
        - diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index c23444a07..1b8307b92 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1213,17 +1213,10 @@

        {{_i}}Buttons for actions{{/i}}

        {{_i}}As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.{{/i}}

        +

        {{_i}}Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements.{{/i}}

        +

        {{_i}}Cross browser compatibility{{/i}}

        +

        {{_i}}IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.{{/i}}

        -
        -

        {{_i}}For anchors and forms{{/i}}

        -

        {{_i}}Button styles can be applied to anything with the .btn applied. However, typically you'll want to apply these to only <a> and <button> elements.{{/i}}

        -
        -
        -

        {{_i}}Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.{{/i}}

        -
        - - -

        {{_i}}Multiple sizes{{/i}}

        {{_i}}Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.{{/i}}

        @@ -1235,8 +1228,7 @@ {{_i}}Primary action{{/i}} {{_i}}Action{{/i}}

        -
        -
        +

        {{_i}}Disabled state{{/i}}

        {{_i}}For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.{{/i}}

        @@ -1249,14 +1241,27 @@

        -

        Cross browser compatibility

        -

        In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.

        -

        Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow—unfortunately we can't fix this.

        +

        {{_i}}One class, multiple tags{{/i}}

        +

        {{_i}}Use the .btn class on an <a>, <button>, or <input> element.{{/i}}

        +
        +{{_i}}Link{{/i}} + + + +
        +
        +<a class="btn" href="">{{_i}}Link{{/i}}</a>
+<button class="btn" type="submit">
+  {{_i}}Button{{/i}}
+</button>
+<input class="btn" type="button" 
+         value="{{_i}}Input{{/i}}">
+<input class="btn" type="submit" 
+         value="{{_i}}Submit{{/i}}">
+
        +

        {{_i}}As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.{{/i}}

        - -
        - diff --git a/less/buttons.less b/less/buttons.less index 61d0bc7bf..880d1f64a 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -9,11 +9,13 @@ .btn { display: inline-block; padding: 4px 10px 4px; + margin-bottom: 0; // For input.btn font-size: @baseFontSize; line-height: @baseLineHeight; color: @grayDark; text-align: center; text-shadow: 0 1px 1px rgba(255,255,255,.75); + vertical-align: middle; #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient border: 1px solid #ccc; border-bottom-color: #bbb; @@ -147,7 +149,7 @@ button.btn, input[type="submit"].btn { &::-moz-focus-inner { - padding: 0; + padding: 0; border: 0; } diff --git a/less/responsive.less b/less/responsive.less index 7d494a357..7ed58bb4e 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -123,7 +123,7 @@ // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET // -------------------------------------------------- -@media (max-width: 768px) { +@media (max-width: 767px) { // GRID & CONTAINERS // ----------------- // Remove width from containers -- cgit v1.2.3 From 1a97cce19bf4e4be082d8724a30b3c1425c660b4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:39:22 -0800 Subject: manual patch of #1449 to make thumbnails use grid vars --- docs/assets/bootstrap.zip | Bin 52563 -> 52563 bytes less/thumbnails.less | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 04562df6f..0776a6085 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/less/thumbnails.less b/less/thumbnails.less index 541fbd6a7..3a12d4e50 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -2,13 +2,13 @@ // ---------- .thumbnails { - margin-left: -20px; + margin-left: -@gridGutterWidth; list-style: none; .clearfix(); } .thumbnails > li { float: left; - margin: 0 0 @baseLineHeight 20px; + margin: 0 0 @baseLineHeight @gridGutterWidth; } .thumbnail { display: block; -- cgit v1.2.3 From 7ce62ffc9813ea2958b353ee36374d3146034dbf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:42:57 -0800 Subject: make after merging in breadcrumbs wrap fix --- docs/assets/bootstrap.zip | Bin 52563 -> 52562 bytes docs/assets/css/bootstrap.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 0776a6085..cf0e66414 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 188b97036..50d1f6944 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2642,7 +2642,7 @@ button.btn.small, input[type="submit"].btn.small { box-shadow: inset 0 1px 0 #ffffff; } .breadcrumb li { - display: inline; + display: inline-block; text-shadow: 0 1px 0 #ffffff; } .breadcrumb .divider { -- cgit v1.2.3 From b5f1d2f3a46e070427eb73857c653b0bf090a1d6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:48:48 -0800 Subject: rearrange order of 3d and skew mixins: --- docs/assets/bootstrap.zip | Bin 52562 -> 52562 bytes less/mixins.less | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index cf0e66414..9de4bed87 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/less/mixins.less b/less/mixins.less index fab1f1568..2b96d21e5 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -322,13 +322,6 @@ -o-transform: translate(@x, @y); transform: translate(@x, @y); } -.translate3d(@x: 0, @y: 0, @z: 0) { - -webkit-transform: translate(@x, @y, @z); - -moz-transform: translate(@x, @y, @z); - -ms-transform: translate(@x, @y, @z); - -o-transform: translate(@x, @y, @z); - transform: translate(@x, @y, @z); -} .skew(@x: 0, @y: 0) { -webkit-transform: skew(@x, @y); -moz-transform: skew(@x, @y); @@ -336,6 +329,13 @@ -o-transform: skew(@x, @y); transform: skew(@x, @y); } +.translate3d(@x: 0, @y: 0, @z: 0) { + -webkit-transform: translate(@x, @y, @z); + -moz-transform: translate(@x, @y, @z); + -ms-transform: translate(@x, @y, @z); + -o-transform: translate(@x, @y, @z); + transform: translate(@x, @y, @z); +} // Background clipping // Heads up: FF 3.6 and under need "padding" instead of "padding-box" -- cgit v1.2.3 From 7dffeb471f53bc3fa974abdd567690f770c8b647 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:55:18 -0800 Subject: fix #1786 to manually fix typo in js docs links --- docs/assets/bootstrap.zip | Bin 52562 -> 52562 bytes docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 9de4bed87..7c1f79a54 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 02467051d..97dfc54a2 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -801,7 +801,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

        About popovers

        Add small overlays of content, like those on the iPad, to any element for housing secondary information.

        -

        * Requires Tooltip to be included

        +

        * Requires Tooltip to be included

        Download file
        diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 965819036..f74859d7e 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -725,7 +725,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

        {{_i}}About popovers{{/i}}

        {{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}

        -

        * {{_i}}Requires Tooltip to be included{{/i}}

        +

        * {{_i}}Requires Tooltip to be included{{/i}}

        {{_i}}Download file{{/i}}
        -- cgit v1.2.3 From 3b57fba754c2536e9c8a8bcf10b24f3e2cec4677 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Feb 2012 00:07:08 -0800 Subject: merge in #1757 and make the chance to the mustache template, then remake --- docs/assets/bootstrap.zip | Bin 52562 -> 52562 bytes docs/templates/pages/base-css.mustache | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7c1f79a54..707487f67 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 1b8307b92..8fe3443a6 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1468,7 +1468,7 @@
        - {{_i}}User{{/i}} + {{_i}}User{{/i}}
        • {{_i}}Edit{{/i}}
          • -- cgit v1.2.3 From 2d9b3c45d3ae5b2e4055435783d0d9428353b70a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Feb 2012 00:13:52 -0800 Subject: move formfieldstate mixin to mixins.less for #1785 --- docs/assets/bootstrap.zip | Bin 52562 -> 52562 bytes less/forms.less | 27 --------------------------- less/mixins.less | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 707487f67..d079b7cc5 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/less/forms.less b/less/forms.less index 3f68df01c..5bce4cebd 100644 --- a/less/forms.less +++ b/less/forms.less @@ -259,33 +259,6 @@ textarea[readonly] { // FORM FIELD FEEDBACK STATES // -------------------------- -// Mixin for form field states -.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { - // Set the text color - > label, - .help-block, - .help-inline { - color: @textColor; - } - // Style inputs accordingly - input, - select, - textarea { - color: @textColor; - border-color: @borderColor; - &:focus { - border-color: darken(@borderColor, 10%); - .box-shadow(0 0 6px lighten(@borderColor, 20%)); - } - } - // Give a small background color for input-prepend/-append - .input-prepend .add-on, - .input-append .add-on { - color: @textColor; - background-color: @backgroundColor; - border-color: @textColor; - } -} // Warning .control-group.warning { .formFieldState(@warningText, @warningText, @warningBackground); diff --git a/less/mixins.less b/less/mixins.less index 2b96d21e5..fffb6c1ce 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -244,8 +244,6 @@ } } - - // Input grid system // ------------------------- #inputGridSystem { @@ -274,6 +272,39 @@ +// Form field states (used in forms.less) +// -------------------------------------------------- + +// Mixin for form field states +.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { + // Set the text color + > label, + .help-block, + .help-inline { + color: @textColor; + } + // Style inputs accordingly + input, + select, + textarea { + color: @textColor; + border-color: @borderColor; + &:focus { + border-color: darken(@borderColor, 10%); + .box-shadow(0 0 6px lighten(@borderColor, 20%)); + } + } + // Give a small background color for input-prepend/-append + .input-prepend .add-on, + .input-append .add-on { + color: @textColor; + background-color: @backgroundColor; + border-color: @textColor; + } +} + + + // CSS3 PROPERTIES // -------------------------------------------------- -- cgit v1.2.3 From adff17ac03e932d09d80d68d6a5b1c0463805dc1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Feb 2012 00:16:05 -0800 Subject: fix for #1779, use line-height var --- docs/assets/bootstrap.zip | Bin 52562 -> 52562 bytes less/dropdowns.less | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d079b7cc5..5d0083c2d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/less/dropdowns.less b/less/dropdowns.less index 118430871..1ec06b04a 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -92,7 +92,7 @@ padding: 3px 15px; clear: both; font-weight: normal; - line-height: 18px; + line-height: @baseLineHeight; color: @gray; white-space: nowrap; } -- cgit v1.2.3 From 11f72f6aa22c9d2daa9a95846e6c786afd7bc3e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Feb 2012 00:31:01 -0800 Subject: merge in #1782, remake to compile html, add some i18n tags --- docs/assets/bootstrap.zip | Bin 52562 -> 52562 bytes docs/javascript.html | 3 +++ docs/templates/pages/javascript.mustache | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 5d0083c2d..5f7a919de 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 97dfc54a2..395394d02 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -773,6 +773,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

        Markup

        For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.

        +
        +<a href="#" rel="tooltip" title="first tooltip">hover over me</a>
+

        Methods

        $().tooltip(options)

        Attaches a tooltip handler to an element collection.

        diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 815aa7f03..c24626f8a 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -698,7 +698,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

        {{_i}}Markup{{/i}}

        {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

        -<a href="#" rel="tooltip" title="first tooltip">{{_i}}hover over me{{/i}}</a>
+<a href="#" rel="tooltip" title="{{_i}}first tooltip{{/i}}">{{_i}}hover over me{{/i}}</a>

        {{_i}}Methods{{/i}}

        $().tooltip({{_i}}options{{/i}})

        -- cgit v1.2.3 From 25bf0af2492920d3da59cc64a23c1a776279a3eb Mon Sep 17 00:00:00 2001 From: Henrik N Date: Tue, 7 Feb 2012 19:29:45 +0100 Subject: Add ol.unstyled --- docs/assets/css/bootstrap.css | 3 ++- less/type.less | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a90e31930..51719d3aa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -374,7 +374,8 @@ ol { li { line-height: 18px; } -ul.unstyled { +ul.unstyled, +ol.unstyled { margin-left: 0; list-style: none; } diff --git a/less/type.less b/less/type.less index 7841bb090..ae43d1940 100644 --- a/less/type.less +++ b/less/type.less @@ -110,7 +110,8 @@ ol { li { line-height: @baseLineHeight; } -ul.unstyled { +ul.unstyled, +ol.unstyled { margin-left: 0; list-style: none; } -- cgit v1.2.3 From 139a07754303e1e53b34a0fca3b9c0a43ee5712b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 7 Feb 2012 21:55:27 -0800 Subject: don't use e.target incase button has icon or other content inside it --- docs/assets/bootstrap.zip | Bin 52562 -> 52560 bytes docs/assets/js/bootstrap-button.js | 2 +- js/bootstrap-button.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 5f7a919de..90fa63336 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index d85c82947..a3f4657e8 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -91,7 +91,7 @@ $(function () { $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - $(e.target).button('toggle') + $(e.currentTarget).button('toggle') }) }) diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index d85c82947..a3f4657e8 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -91,7 +91,7 @@ $(function () { $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - $(e.target).button('toggle') + $(e.currentTarget).button('toggle') }) }) -- cgit v1.2.3 From 04fd01d4b67b8f71fe58affb34fcf4907ccabc98 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 7 Feb 2012 22:04:52 -0800 Subject: fix docs for carousel markup --- docs/assets/bootstrap.zip | Bin 52560 -> 52560 bytes docs/javascript.html | 6 ++++-- docs/templates/pages/javascript.mustache | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 90fa63336..132c95a7b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 395394d02..28c0964f0 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1304,10 +1304,12 @@ $('#myCollapsible').on('hidden', function () {

        Markup

        Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.

        -<div class="carousel">
+<div id="myCarousel" class="carousel">
   <!-- Carousel items -->
   <div class="carousel-inner">
-    ...
+    <div class="active item">…</div>
+    <div class="item">…</div>
+    <div class="item">…</div>
   </div>
   <!-- Carousel nav -->
   <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c24626f8a..3ff0ed8b6 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1228,10 +1228,12 @@ $('#myCollapsible').on('hidden', function () {
           
        {{_i}}Markup{{/i}}
        
           
        {{_i}}Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.{{/i}}
        
 
        -<div class="carousel">
+<div id="myCarousel" class="carousel">
   <!-- {{_i}}Carousel items{{/i}} -->
   <div class="carousel-inner">
-    ...
+    <div class="active item">…</div>
+    <div class="item">…</div>
+    <div class="item">…</div>
   </div>
   <!-- {{_i}}Carousel nav{{/i}} -->
   <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
-- 
cgit v1.2.3


From b36a744fa74ace319b9f924f777df50591ceb62c Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 7 Feb 2012 22:32:32 -0800
Subject: remove small class

---
 docs/assets/bootstrap.zip                | Bin 52560 -> 52560 bytes
 docs/javascript.html                     |   2 +-
 docs/templates/pages/javascript.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 132c95a7b..ed47cebd5 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index 28c0964f0..06ce514a1 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -926,7 +926,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             
        Oh snap! You got an error!
        
             
        Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
        
             
        
-              Take this action Or do this
+              Take this action Or do this
        diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 3ff0ed8b6..705b35b47 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -850,7 +850,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

        {{_i}}Oh snap! You got an error!{{/i}}

        {{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}

        - {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}} + {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}}

        -- cgit v1.2.3 From 2e5a81601cfde62dca8a05125e2640787c8b7424 Mon Sep 17 00:00:00 2001 From: Silumesii Maboshe Date: Wed, 8 Feb 2012 17:11:51 +0200 Subject: Typo. --- docs/templates/pages/upgrading.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index 45ab0703b..bac697e21 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -170,7 +170,7 @@

        {{_i}}Javascript plugins{{/i}}

        - {{_i}}Heads up!{{/i}} {{_i}}We're rewritten just about everything for our plugins, so head on over to the Javascript page to learn more.{{/i}} + {{_i}}Heads up!{{/i}} {{_i}}We've rewritten just about everything for our plugins, so head on over to the Javascript page to learn more.{{/i}}

        {{_i}}Popovers{{/i}}

          -- cgit v1.2.3 From 920d9958431b3d0a08401bfbc097416bc83211bd Mon Sep 17 00:00:00 2001 From: Jeremy Martin Date: Thu, 9 Feb 2012 15:27:42 -0500 Subject: webkit legend margin fix for non-horizontal forms --- less/forms.less | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/less/forms.less b/less/forms.less index 5bce4cebd..5fbb53c9a 100644 --- a/less/forms.less +++ b/less/forms.less @@ -459,15 +459,16 @@ select:focus:required:invalid { margin-bottom: @baseLineHeight / 2; } +// Legend collapses margin, so next element is responsible for spacing +legend + .control-group { + margin-top: @baseLineHeight; + -webkit-margin-top-collapse: separate; +} + // Horizontal-specific styles // -------------------------- .form-horizontal { - // Legend collapses margin, so we're relegated to padding - legend + .control-group { - margin-top: @baseLineHeight; - -webkit-margin-top-collapse: separate; - } // Increase spacing between groups .control-group { margin-bottom: @baseLineHeight; -- cgit v1.2.3 From 4c7b9b8fcedc1dfedf24858e821c3add487ffc68 Mon Sep 17 00:00:00 2001 From: Chris Wiederspan Date: Thu, 9 Feb 2012 14:28:12 -0700 Subject: Added an overriding filter: progid:DXImageTransform.Microsoft.gradient(enabled=false) to the .subnav-fixed class that fixes the bug caused on nav dropdown menus when "docked" in the fixed position. --- docs/assets/css/docs.css | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c3a6848d7..a2deaa9eb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -190,6 +190,7 @@ hr.soften { -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ } .subnav-fixed .nav { width: 938px; -- cgit v1.2.3 From 451a642ae813f0b3a3f61af69eaeca927547b755 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 9 Feb 2012 23:08:14 +0100 Subject: Added a black/dark button --- docs/templates/pages/base-css.mustache | 5 +++++ less/buttons.less | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 8fe3443a6..d2bea9209 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1205,6 +1205,11 @@ {{_i}}Danger{{/i}} .btn-danger {{_i}}Indicates a dangerous or potentially negative action{{/i}} + + + {{_i}}Dark{{/i}} + .btn-dark + {{_i}}Indicates a potential abort or black magic{{/i}} diff --git a/less/buttons.less b/less/buttons.less index 880d1f64a..4c508d7fe 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -107,7 +107,9 @@ .btn-success, .btn-success:hover, .btn-info, -.btn-info:hover { +.btn-info:hover, +.btn-dark, +.btn-dark:hover { text-shadow: 0 -1px 0 rgba(0,0,0,.25); color: @white; } @@ -116,7 +118,8 @@ .btn-warning.active, .btn-danger.active, .btn-success.active, -.btn-info.active { +.btn-info.active, +.btn-dark.active { color: rgba(255,255,255,.75); } @@ -141,6 +144,10 @@ .btn-info { .buttonBackground(#5bc0de, #2f96b4); } +// Dark appears as black +.btn-dark { + .buttonBackground(#454545, #262626); +} // Cross-browser Jank -- cgit v1.2.3 From d9eff8efc1ee426f3622ab131d8b6726d471040d Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 10 Feb 2012 00:31:40 +0100 Subject: Added the carret of the button --- less/button-groups.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/less/button-groups.less b/less/button-groups.less index 4b0523df2..d8957c52d 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -133,7 +133,8 @@ .btn-primary, .btn-danger, .btn-info, -.btn-success { +.btn-success, +.btn-dark { .caret { border-top-color: @white; .opacity(75); -- cgit v1.2.3 From d7aefe67e3df78bde61eaa7ecab807bb03aeb1ef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:07:32 -0800 Subject: scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag --- docs/assets/bootstrap.zip | Bin 52560 -> 52621 bytes docs/assets/css/bootstrap.css | 13 ++++++++----- docs/assets/css/docs.css | 3 --- docs/base-css.html | 1 + docs/templates/pages/base-css.mustache | 1 + docs/upgrading.html | 7 +++++++ less/code.less | 10 ++++++++++ less/tables.less | 7 ++++--- 8 files changed, 31 insertions(+), 11 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index ed47cebd5..416ee8766 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0b622d7d4..144783be4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -374,8 +374,7 @@ ol { li { line-height: 18px; } -ul.unstyled, -ol.unstyled { +ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } @@ -499,6 +498,10 @@ pre code { background-color: transparent; border: 0; } +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} form { margin: 0 0 18px; } @@ -1004,14 +1007,14 @@ table { padding: 8px; line-height: 18px; text-align: left; + vertical-align: top; border-top: 1px solid #ddd; } .table th { font-weight: bold; - vertical-align: bottom; } -.table td { - vertical-align: top; +.table thead th { + vertical-align: bottom; } .table thead:first-child tr th, .table thead:first-child tr td { border-top: 0; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c3a6848d7..4cdbb0c7c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -481,9 +481,6 @@ hr.soften { /* Misc -------------------------------------------------- */ -pre.prettyprint { - overflow: hidden; -} .browser-support { max-width: 100%; diff --git a/docs/base-css.html b/docs/base-css.html index 3317f9321..ac260bffb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -385,6 +385,7 @@ For example, <code>section</code> should be wrapped as inline. </pre>

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

          +

          You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.

          Google Prettify

          diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 8fe3443a6..0be4c1e34 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -309,6 +309,7 @@ </pre>

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

          +

          {{_i}}You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.{{/i}}

          Google Prettify

          diff --git a/docs/upgrading.html b/docs/upgrading.html index 47cac06dc..5ab8a39ba 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -248,6 +248,13 @@
          Heads up! We're rewritten just about everything for our plugins, so head on over to the Javascript page to learn more.
          +

          Tooltips

          +
            +
          • The plugin method has been renamed from twipsy() to tooltip(), and the class name changed from twipsy to tooltip.
            • +
          • The placement option value that was below is now bottom, and above is now top.
            • +
          • The animate option was renamed to animation.
            • +
          • The html option was removed, as the tooltips default to allowing HTML now.
            • +

          Popovers

          • Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.
            • diff --git a/less/code.less b/less/code.less index e75cfa00d..35a8ae6b8 100644 --- a/less/code.less +++ b/less/code.less @@ -11,12 +11,16 @@ pre { color: @grayDark; .border-radius(3px); } + +// Inline code code { padding: 3px 4px; color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; } + +// Blocks of code pre { display: block; padding: (@baseLineHeight - 1) / 2; @@ -44,3 +48,9 @@ pre { border: 0; } } + +// Enable scrollable blocks of code +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} \ No newline at end of file diff --git a/less/tables.less b/less/tables.less index cbc013aca..3a4066d71 100644 --- a/less/tables.less +++ b/less/tables.less @@ -25,14 +25,15 @@ table { padding: 8px; line-height: @baseLineHeight; text-align: left; + vertical-align: top; border-top: 1px solid #ddd; } th { font-weight: bold; - vertical-align: bottom; } - td { - vertical-align: top; + // Bottom align for column headings + thead th { + vertical-align: bottom; } // Remove top border from thead by default thead:first-child tr th, -- cgit v1.2.3 From 8a91f927f51fc96221dd553baef5dbe73b8b9b4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:37:54 -0800 Subject: clarify npm install command in less docs --- docs/assets/bootstrap.zip | Bin 52621 -> 52621 bytes docs/less.html | 4 ++-- docs/templates/pages/less.mustache | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 416ee8766..382cbcef4 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index 92b9099f5..9f7df3ec9 100644 --- a/docs/less.html +++ b/docs/less.html @@ -717,8 +717,8 @@

            Node with makefile

            -

            Install the LESS command line compiler with npm by running the following command:

            - 
            $ npm install less
            +

            Install the LESS command line compiler globally with npm by running the following command:

            + 
            $ npm install -g less

            Once installed just run make from the root of your bootstrap directory and you're all set.

            Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

            diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index b431106ac..fe0a6eb84 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -641,8 +641,8 @@

            {{_i}}Node with makefile{{/i}}

            -

            {{_i}}Install the LESS command line compiler with npm by running the following command:{{/i}}

            - 
            $ npm install less
            +

            {{_i}}Install the LESS command line compiler globally with npm by running the following command:{{/i}}

            + 
            $ npm install -g less

            {{_i}}Once installed just run make from the root of your bootstrap directory and you're all set.{{/i}}

            {{_i}}Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}

            -- cgit v1.2.3 From c720d951be4481dab684955b7ef1a4ebb03ed0cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:50:45 -0800 Subject: add best practices and re-org the button groups --- docs/assets/bootstrap.zip | Bin 52621 -> 52621 bytes docs/components.html | 38 +++++++++++++++++++------------ docs/templates/pages/components.mustache | 38 +++++++++++++++++++------------ 3 files changed, 46 insertions(+), 30 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 382cbcef4..0c63fb363 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index 2a31528ea..cb41c736e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -118,14 +118,34 @@

            Button groups

            Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.

            -

            You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.

            -
            -
            +

            Best practices

            +

            We recommend the following guidelines for using button groups and toolbars:

            +
              +
            • Always use the same element in a single button group, <a> or <button>.
              • +
            • Don't mix buttons of different colors in the same button group.
              • +
            • Use icons in addition to or instead of text, but be sure include alt and title text where appropriate.
              • +
            +

            Related Button groups with dropdowns (see below) should be called out separately and always include a dropdown caret to indicate intended behavior.

            +
            +
            +

            Default example

            +

            Here's how the HTML looks for a standard button group built with anchor tag buttons:

            + +
            +<div class="btn-group">
+  <a class="btn" href="#">1</a>
+  <a class="btn" href="#">2</a>
+  <a class="btn" href="#">3</a>
+</div>
+
            +

            Toolbar example

            +

            Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.

            1 @@ -142,18 +162,6 @@ 8
            -
            -
            -

            Example markup

            -

            Here's how the HTML looks for a standard button group built with anchor tag buttons:

            -
            -<div class="btn-group">
-  <a class="btn" href="#">1</a>
-  <a class="btn" href="#">2</a>
-  <a class="btn" href="#">3</a>
-</div>
-
            -

            And with a toolbar for multiple groups:

             <div class="btn-toolbar">
   <div class="btn-group">
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 226283004..62a7083b6 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -42,14 +42,34 @@
     
            
       
            {{_i}}Button groups{{/i}}
            
       
            {{_i}}Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.{{/i}}
            
-      
            {{_i}}You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.{{/i}}
            
-      
            
-        
            
+      
            {{_i}}Best practices{{/i}}
            
+      
            {{_i}}We recommend the following guidelines for using button groups and toolbars:{{/i}}
            
+      
              
+        
            • {{_i}}Always use the same element in a single button group, <a> or <button>.{{/i}}
              • 
+        
            • {{_i}}Don't mix buttons of different colors in the same button group.{{/i}}
              • 
+        
            • {{_i}}Use icons in addition to or instead of text, but be sure include alt and title text where appropriate.{{/i}}
              • 
+      
            
+      
            {{_i}}Related Button groups with dropdowns (see below) should be called out separately and always include a dropdown caret to indicate intended behavior.{{/i}}
            
+    
            
+    
            
+      
            {{_i}}Default example{{/i}}
            
+      
            {{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}
            
+      
+
            +<div class="btn-group">
+  <a class="btn" href="#">1</a>
+  <a class="btn" href="#">2</a>
+  <a class="btn" href="#">3</a>
+</div>
+
            
+      
            {{_i}}Toolbar example{{/i}}
            
+      
            {{_i}}Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.{{/i}}
            
       
            
         
            
           1
@@ -66,18 +86,6 @@
           8
         
            
       
            
-    
            
-    
            
-      
            {{_i}}Example markup{{/i}}
            
-      
            {{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}
            
-
            -<div class="btn-group">
-  <a class="btn" href="#">1</a>
-  <a class="btn" href="#">2</a>
-  <a class="btn" href="#">3</a>
-</div>
-
            
-      
            {{_i}}And with a toolbar for multiple groups:{{/i}}
            
 
             <div class="btn-toolbar">
   <div class="btn-group">
-- 
cgit v1.2.3


From b4b3343a617f8b23abcfa502dfd5fb4ff7c50ba1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 10 Feb 2012 23:57:31 -0800
Subject: clarify structure of responsive css file

---
 docs/assets/bootstrap.zip                 | Bin 52621 -> 52621 bytes
 docs/scaffolding.html                     |   2 +-
 docs/templates/pages/scaffolding.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0c63fb363..d0a3ffdf7 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b2962f317..d58c0e15b 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -315,7 +315,7 @@
     
            
     
            
       
            Supported devices
            
-      
            Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:
            
+      
            Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:
            
       
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 1694a052d..c14930c52 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -239,7 +239,7 @@
     
            
       
            {{_i}}Supported devices{{/i}}
            
-      
            {{_i}}Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}
            
+      
            {{_i}}Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}
            
       
            
         
           
            
     
            
-- 
cgit v1.2.3


From 89205d9db43f6c2fb2ed14cdb11c50c858de0550 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 10 Feb 2012 23:59:00 -0800
Subject: manually address #1895

---
 docs/assets/bootstrap.zip     | Bin 52621 -> 52623 bytes
 docs/assets/css/bootstrap.css |   2 +-
 less/type.less                |   2 +-
 less/variables.less           |   3 +++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d0a3ffdf7..6db7bd327 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 144783be4..9f0420b5b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -393,7 +393,7 @@ dd {
 hr {
   margin: 18px 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid #eeeeee;
   border-bottom: 1px solid #ffffff;
 }
 strong {
diff --git a/less/type.less b/less/type.less
index ae43d1940..6ba83bc3a 100644
--- a/less/type.less
+++ b/less/type.less
@@ -138,7 +138,7 @@ dd {
 hr {
   margin: @baseLineHeight 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid @hrBorder;
   border-bottom: 1px solid @white;
 }
 
diff --git a/less/variables.less b/less/variables.less
index 9f58d730e..ced64d7cd 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -61,6 +61,9 @@
 // Input placeholder text color
 @placeholderText:         @grayLight;
 
+// Hr border color
+@hrBorder:                @grayLighter;
+
 // Navbar
 @navbarHeight:                    40px;
 @navbarBackground:                @grayDarker;
-- 
cgit v1.2.3


From 02cb4df4697acacfdc65560e14994eccd6ebda7e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:01:35 -0800
Subject: fix some single vs double quotes, fix typo in js docs per #1900

---
 docs/assets/bootstrap.zip                | Bin 52623 -> 52623 bytes
 docs/javascript.html                     |   4 ++--
 docs/templates/pages/javascript.mustache |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 6db7bd327..3bbb15de1 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index 06ce514a1..2d8b0f596 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -700,14 +700,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
       
            
         
            
           
            About Tooltips
            
-          
            Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.
            
+          
            Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.
            
           Download file
         
            
         
            
           
            Example use of Tooltips
            
           
            Hover over the links below to see tooltips:
            
           
            
-            
            Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
+            
            Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
             
            
           
            
           
            
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 705b35b47..89e15007f 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -624,14 +624,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
       
            
         
            
           
            {{_i}}About Tooltips{{/i}}
            
-          
            {{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.{{/i}}
            
+          
            {{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.{{/i}}
            
           {{_i}}Download file{{/i}}
         
            
         
            
           
            {{_i}}Example use of Tooltips{{/i}}
            
           
            {{_i}}Hover over the links below to see tooltips:{{/i}}
            
           
            
-            
            {{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}}
+            
            {{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}}
             
            
           
            
           
            
-- 
cgit v1.2.3


From a63663a3b6309e98068a79b863b0f77031e5035e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:02:28 -0800
Subject: fix type in less docs per #1902

---
 docs/assets/bootstrap.zip          | Bin 52623 -> 52623 bytes
 docs/less.html                     |   2 +-
 docs/templates/pages/less.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3bbb15de1..3b87a25c0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/less.html b/docs/less.html
index 9f7df3ec9..0d1527fb3 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -123,7 +123,7 @@
     
            
     
            
       
            Operations
            
-      
            Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.
            
+      
            Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiply, divide, add, and subtract your way to CSS sanity.
            
     
            
   
            
 
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index fe0a6eb84..742b166d2 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -47,7 +47,7 @@
     
            
     
            
       
            {{_i}}Operations{{/i}}
            
-      
            {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}
            
+      
            {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiply, divide, add, and subtract your way to CSS sanity.{{/i}}
            
     
            
   
            
 
-- 
cgit v1.2.3


From 722c75d1b19fbb9ed98be0afa54f4f79c9f7ee48 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:07:05 -0800
Subject: update selectors for icons to include matcher for icon class in
 middle of class attr, remove docs mention of requiring icon-* first

---
 docs/assets/bootstrap.zip              | Bin 52623 -> 52644 bytes
 docs/assets/css/bootstrap.css          |   4 ++--
 docs/base-css.html                     |   4 ----
 docs/templates/pages/base-css.mustache |   4 ----
 less/sprites.less                      |   3 ++-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3b87a25c0..ce828690e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9f0420b5b..d4d311b20 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1128,7 +1128,7 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
-[class^="icon-"] {
+[class^="icon-"], [class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
@@ -1139,7 +1139,7 @@ table .span12 {
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-[class^="icon-"]:last-child {
+[class^="icon-"]:last-child, [class*=" icon-"]:last-child {
   *margin-left: 0;
 }
 .icon-white {
diff --git a/docs/base-css.html b/docs/base-css.html
index ac260bffb..c0ad882a5 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1515,10 +1515,6 @@ For example, <code>section</code> should be wrapped as inline.
 <i class="icon-search icon-white"></i>
 
       
            There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
            
-      
            
-        Heads up!
-        The .icon- class must be listed first in the class tag for proper CSS targeting.
-      
            
     
     
            
       
            Use cases
            
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 0be4c1e34..750957beb 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1439,10 +1439,6 @@
 <i class="icon-search icon-white"></i>
 
       
            {{_i}}There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
            
-      
            
-        {{_i}}Heads up!{{/i}}
-        {{_i}}The .icon- class must be listed first in the class tag for proper CSS targeting.{{/i}}
-      
            
     
            
     
            
       
            {{_i}}Use cases{{/i}}
            
diff --git a/less/sprites.less b/less/sprites.less
index ce7668844..a7741661e 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -14,7 +14,8 @@
 // For the white version of the  icons, just add the .icon-white class:
 // 
 
-[class^="icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
-- 
cgit v1.2.3


From cbccbed8c8ebdfe0f02502b1915106d56c90b3cc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:10:26 -0800
Subject: fix javascript text on tooltips per #1862

---
 docs/assets/bootstrap.zip                | Bin 52644 -> 52644 bytes
 docs/javascript.html                     |   2 +-
 docs/templates/pages/javascript.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ce828690e..feffa87c0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index 2d8b0f596..1d0afb9e0 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -134,7 +134,7 @@
         
            
           
         
            
         
            
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 89e15007f..012e195f5 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -58,7 +58,7 @@
         
            
           
         
            
         
            
-- 
cgit v1.2.3


From efac5441d83079653dabcdd4879102ec8ccb72be Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:11:34 -0800
Subject: move legend fix out of horizontal and to all forms

---
 docs/assets/bootstrap.zip     | Bin 52644 -> 52641 bytes
 docs/assets/css/bootstrap.css |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index feffa87c0..8f614f14d 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d4d311b20..09688778b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -967,7 +967,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .control-group {
   margin-bottom: 9px;
 }
-.form-horizontal legend + .control-group {
+legend + .control-group {
   margin-top: 18px;
   -webkit-margin-top-collapse: separate;
 }
-- 
cgit v1.2.3


From 60ee76853726f9711a41a865169d66cf136e5f71 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:16:13 -0800
Subject: fix type on responsive grid per #1852

---
 docs/assets/bootstrap.zip                 | Bin 52641 -> 52641 bytes
 docs/scaffolding.html                     |   2 +-
 docs/templates/pages/scaffolding.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8f614f14d..e8ca60a6d 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index d58c0e15b..6ed5857ff 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -339,7 +339,7 @@
           
            
-            
+            
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index c14930c52..46437782b 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -263,7 +263,7 @@
           
-            
+            
-- 
cgit v1.2.3


From 8f1db4321a35851d5b726290b2d99e7ea1ec7239 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:24:06 -0800
Subject: fix inline form checkbox/radios

---
 docs/assets/bootstrap.zip              | Bin 52641 -> 52675 bytes
 docs/assets/css/bootstrap.css          |   7 +++++++
 docs/base-css.html                     |   5 ++++-
 docs/templates/pages/base-css.mustache |   5 ++++-
 less/forms.less                        |   8 ++++++++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e8ca60a6d..3097692de 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 09688778b..1391ad41e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -964,6 +964,13 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .form-inline .input-prepend .add-on {
   vertical-align: middle;
 }
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
 .control-group {
   margin-bottom: 9px;
 }
diff --git a/docs/base-css.html b/docs/base-css.html
index c0ad882a5..09614af2a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -907,7 +907,10 @@ For example, <code>section</code> should be wrapped as inline.
       
            
         
         
-        
+        
+        
       
 
             <form class="well form-inline">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 750957beb..5e20aae2c 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -831,7 +831,10 @@
       
            
         
         
-        
+        
+        
       
 
             <form class="well form-inline">
diff --git a/less/forms.less b/less/forms.less
index 5fbb53c9a..17393b280 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -453,6 +453,14 @@ select:focus:required:invalid {
 .form-inline .input-prepend .add-on {
   vertical-align: middle;
 }
+// Inline checkbox/radio labels
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
 
 // Margin to space out fieldsets
 .control-group {
-- 
cgit v1.2.3


From 2679c3ebe3bb21599826dd204b1c9df44d217497 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 10:13:53 -0800
Subject: remove the reset type from cancel buttons in forms examples per #1844

---
 docs/assets/bootstrap.zip              | Bin 52675 -> 52675 bytes
 docs/base-css.html                     |   6 +++---
 docs/templates/pages/base-css.mustache |   6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3097692de..81a5fd5ba 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 09614af2a..678504b72 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -984,7 +984,7 @@ For example, <code>section</code> should be wrapped as inline.
           
           
            
             
-            
+            
           
            
         
       
@@ -1093,7 +1093,7 @@ For example, <code>section</code> should be wrapped as inline.
           
           
            
             
-            
+            
           
            
         
       
@@ -1217,7 +1217,7 @@ For example, <code>section</code> should be wrapped as inline.
           
           
            
             
-            
+            
           
            
         
       
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 5e20aae2c..f1584ed74 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -908,7 +908,7 @@
           
           
            
             
-            
+            
           
            
         
       
@@ -1017,7 +1017,7 @@
           
           
            
             
-            
+            
           
            
         
       
@@ -1141,7 +1141,7 @@
           
           
            
             
-            
+            
           
            
         
       
-- 
cgit v1.2.3


From 102bb8e68439d28334c2c9f6e4579fdd9950c102 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 10:38:41 -0800
Subject: clear up some messaging in docs on fluid grid system and nesting
 overall

---
 docs/assets/bootstrap.zip                 | Bin 52675 -> 52675 bytes
 docs/scaffolding.html                     |  18 +++++++++++++++++-
 docs/templates/pages/scaffolding.mustache |  18 +++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 81a5fd5ba..ed52bb830 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 6ed5857ff..58bf88b24 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -173,7 +173,8 @@
   
            
     
            
       
            With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.
            
-      
            Example
            
+      
            Example
            
+      
            Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested .span3 columns should be placed within a .span6.
            
       
            
         
            
           Level 1 of column
@@ -187,6 +188,21 @@
           
            
         
            
       
            
+      
            Fluid example
            
+      
            Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.
            
+      
            
+        
            
+          Fluid 12
+          
            
+            
            
+              Fluid 6
+            
            
+            
            
+              Fluid 6
+            
            
+          
            
+        
            
+      
            
     
            
     
            
 
            diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 46437782b..74b824d9c 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -97,7 +97,8 @@
   
            
     
            
       
            {{_i}}With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.{{/i}}
            
-      
            {{_i}}Example{{/i}}
            
+      
            {{_i}}Example{{/i}}
            
+      
            {{_i}}Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested .span3 columns should be placed within a .span6.{{/i}}
            
       
            
         
            
           {{_i}}Level 1 of column{{/i}}
@@ -111,6 +112,21 @@
           
            
         
            
       
            
+      
            {{_i}}Fluid example{{/i}}
            
+      
            {{_i}}Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.{{/i}}
            
+      
            
+        
            
+          {{_i}}Fluid 12{{/i}}
+          
            
+            
            
+              {{_i}}Fluid 6{{/i}}
+            
            
+            
            
+              {{_i}}Fluid 6{{/i}}
+            
            
+          
            
+        
            
+      
            
     
            
     
            
 
            -- 
cgit v1.2.3


From 4ddc8fd0e41a4bf76249645674806a7f11e64879 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 16:43:53 -0800
Subject: remove color on :active of buttons

---
 docs/assets/bootstrap.zip     | Bin 52675 -> 52665 bytes
 docs/assets/css/bootstrap.css |   1 -
 less/buttons.less             |   1 -
 3 files changed, 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ed52bb830..6532a299b 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 1391ad41e..e32d2b13c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1732,7 +1732,6 @@ table .span12 {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   background-color: #e6e6e6;
   background-color: #d9d9d9 \9;
-  color: rgba(0, 0, 0, 0.5);
   outline: 0;
 }
 .btn.disabled, .btn[disabled] {
diff --git a/less/buttons.less b/less/buttons.less
index 880d1f64a..0dc9e374b 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -53,7 +53,6 @@
   .box-shadow(@shadow);
   background-color: darken(@white, 10%);
   background-color: darken(@white, 15%) e("\9");
-  color: rgba(0,0,0,.5);
   outline: 0;
 }
 
-- 
cgit v1.2.3


From 5a3dfb72bfcf1859690c76a8ddb8457eb962bdb3 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 16:50:57 -0800
Subject: support small for legend per #1544

---
 docs/assets/bootstrap.zip     | Bin 52665 -> 52683 bytes
 docs/assets/css/bootstrap.css |   4 ++++
 less/forms.less               |   6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 6532a299b..77e70e94d 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e32d2b13c..9654d856f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -521,6 +521,10 @@ legend {
   border: 0;
   border-bottom: 1px solid #eee;
 }
+legend small {
+  font-size: 13.5px;
+  color: #999999;
+}
 label,
 input,
 button,
diff --git a/less/forms.less b/less/forms.less
index 17393b280..f262af0db 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -28,6 +28,12 @@ legend {
   color: @grayDark;
   border: 0;
   border-bottom: 1px solid #eee;
+
+  // Small
+  small {
+    font-size: @baseLineHeight * .75;
+    color: @grayLight;
+  }
 }
 
 // Set font for forms
-- 
cgit v1.2.3


From a497e9010a5fcf4fce7e7112a0d3f32da57e8adb Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 17:12:32 -0800
Subject: make button examples button element and add upgrade note on tooltip
 positions per #1532

---
 docs/assets/bootstrap.zip               | Bin 52683 -> 52683 bytes
 docs/base-css.html                      |  16 ++++++++--------
 docs/templates/pages/base-css.mustache  |  16 ++++++++--------
 docs/templates/pages/upgrading.mustache |   4 ++++
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 77e70e94d..dc3849f1d 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 678504b72..2ee0f2d29 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1301,23 +1301,23 @@ For example, <code>section</code> should be wrapped as inline.
       
            Multiple sizes
            
       
            Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.
            
       
            
-        Primary action
-        Action
+        
+        
       
            
       
            
-        Primary action
-        Action
+        
+        
       
            
       
            
       
            Disabled state
            
       
            For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.
            
       
            
-        Primary action
-        Action
+        Primary link
+        Link
       
            
       
            
-        
-        
+        
+        
       
            
     
            
     
            
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index f1584ed74..01b79c7a5 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1225,23 +1225,23 @@
       
            {{_i}}Multiple sizes{{/i}}
            
       
            {{_i}}Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.{{/i}}
            
       
            
-        {{_i}}Primary action{{/i}}
-        {{_i}}Action{{/i}}
+        
+        
       
            
       
            
-        {{_i}}Primary action{{/i}}
-        {{_i}}Action{{/i}}
+        
+        
       
            
       
            
       
            {{_i}}Disabled state{{/i}}
            
       
            {{_i}}For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.{{/i}}
            
       
            
-        {{_i}}Primary action{{/i}}
-        {{_i}}Action{{/i}}
+        {{_i}}Primary link{{/i}}
+        {{_i}}Link{{/i}}
       
            
       
            
-        
-        
+        
+        
       
            
     
            
     
            
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 77e2e02cd..5a370f113 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -179,6 +179,10 @@
     
          • {{_i}}The animate option was renamed to animation.{{/i}}
            • 
     
          • {{_i}}The html option was removed, as the tooltips default to allowing HTML now.{{/i}}
            • 
   
+  
            {{_i}}Tooltips{{/i}}
            
+  
              
+    
            • {{_i}}Values for placement option changed from above and below to top and bottom. (Affects popovers, too.){{/i}}
              • 
+  
            
   
            {{_i}}Popovers{{/i}}
            
   
              
     
            • {{_i}}Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.{{/i}}
              • 
-- 
cgit v1.2.3


From c16ccf64f1f51bca4e4564d23211274e3d995e16 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 17:25:30 -0800
Subject: update tooltips message in upgrade docs

---
 docs/upgrading.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 5ab8a39ba..5416b9987 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -246,7 +246,7 @@
     
              Javascript plugins
              
   
            
   
            
-    Heads up! We're rewritten just about everything for our plugins, so head on over to the Javascript page to learn more.
+    Heads up! We've rewritten just about everything for our plugins, so head on over to the Javascript page to learn more.
   
            
   
            Tooltips
            
   
              
@@ -255,6 +255,10 @@
     
            • The animate option was renamed to animation.
              • 
     
            • The html option was removed, as the tooltips default to allowing HTML now.
              • 
   
            
+  
            Tooltips
            
+  
              
+    
            • Values for placement option changed from above and below to top and bottom. (Affects popovers, too.)
              • 
+  
            
   
            Popovers
            
   
              
     
            • Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.
              • 
-- 
cgit v1.2.3


From a84092d2257ba8e000e2c656e6cb1b8415d0d9ac Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 17:25:47 -0800
Subject: update buttons docs for .disabled class per #1774

---
 docs/assets/bootstrap.zip              | Bin 52683 -> 52683 bytes
 docs/base-css.html                     |   8 ++++++--
 docs/templates/pages/base-css.mustache |   8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index dc3849f1d..9055e367e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 2ee0f2d29..46cf982c6 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1310,15 +1310,19 @@ For example, <code>section</code> should be wrapped as inline.
       
              
       
              
       
              Disabled state
              
-      
              For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.
              
+      
              For disabled buttons, add the .disabled class to links and the disabled attribute for <button> elements.
              
       
              
         Primary link
         Link
       
              
-      
              
+      
              
         
         
       
              
+      
              
+        Heads up!
+        We use .disabled as a utility class here, similar to the common .active class, so no prefix is required.
+      
              
     
            
     
            
       
            One class, multiple tags
            
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 01b79c7a5..e56f45ca0 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1234,15 +1234,19 @@
       
            
       
            
       
            {{_i}}Disabled state{{/i}}
            
-      
            {{_i}}For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.{{/i}}
            
+      
            {{_i}}For disabled buttons, add the .disabled class to links and the disabled attribute for <button> elements.{{/i}}
            
       
            
         {{_i}}Primary link{{/i}}
         {{_i}}Link{{/i}}
       
            
-      
            
+      
            
         
         
       
            
+      
            
+        {{_i}}Heads up!{{/i}}
+        {{_i}}We use .disabled as a utility class here, similar to the common .active class, so no prefix is required.{{/i}}
+      
            
     
            
     
            
       
            {{_i}}One class, multiple tags{{/i}}
            
-- 
cgit v1.2.3


From 5b22cf5cc3f06d4f63dfbd7579cfec32eb2c2c79 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 17:27:08 -0800
Subject: fix tabs content wrapping per #1620

---
 docs/assets/bootstrap.zip     | Bin 52683 -> 52687 bytes
 docs/assets/css/bootstrap.css |   3 +++
 less/navs.less                |   3 +++
 3 files changed, 6 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 9055e367e..3284ea5eb 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9654d856f..407ded775 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2282,6 +2282,9 @@ button.btn.small, input[type="submit"].btn.small {
 .tabbable:after {
   clear: both;
 }
+.tab-content {
+  overflow: hidden;
+}
 .tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
   border-bottom: 0;
 }
diff --git a/less/navs.less b/less/navs.less
index a29cb712b..0d37ea388 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -249,6 +249,9 @@
 .tabbable {
   .clearfix();
 }
+.tab-content {
+  overflow: hidden; // prevent content from running below tabs
+}
 
 // Remove border on bottom, left, right
 .tabs-below .nav-tabs,
-- 
cgit v1.2.3


From 5bb55e46157ec974120535acdb6335841c85fa37 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 19:21:23 -0800
Subject: change fixed height on responsive textareas to min-height

---
 docs/assets/bootstrap.zip                | Bin 52687 -> 52693 bytes
 docs/assets/css/bootstrap-responsive.css |   2 +-
 less/responsive.less                     |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3284ea5eb..4bad32b3e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 4d464ea88..c8c630296 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -25,7 +25,7 @@
   .uneditable-input {
     display: block;
     width: 100%;
-    height: 28px;
+    min-height: 28px;
     /* Make inputs at least the height of their button counterpart */
   
     /* Makes inputs behave like true block-level elements */
diff --git a/less/responsive.less b/less/responsive.less
index 7ed58bb4e..1e3bf371c 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -56,7 +56,7 @@
   .uneditable-input {
     display: block;
     width: 100%;
-    height: 28px; /* Make inputs at least the height of their button counterpart */
+    min-height: 28px; /* Make inputs at least the height of their button counterpart */
     /* Makes inputs behave like true block-level elements */
     -webkit-box-sizing: border-box; /* Older Webkit */
        -moz-box-sizing: border-box; /* Older FF */
-- 
cgit v1.2.3


From 158419c0455ea499197f8b7917bdfe299caaac19 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 20:00:44 -0800
Subject: reset line-height for file input in ie9

---
 docs/assets/bootstrap.zip     | Bin 52693 -> 52705 bytes
 docs/assets/css/bootstrap.css |   3 +++
 less/forms.less               |   5 +++++
 3 files changed, 8 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 4bad32b3e..48e48f502 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 407ded775..13af821b4 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -603,6 +603,9 @@ select, input[type="file"] {
 
   line-height: 28px;
 }
+input[type="file"] {
+  line-height: 18px \9;
+}
 select {
   width: 220px;
   background-color: #ffffff;
diff --git a/less/forms.less b/less/forms.less
index f262af0db..7f076aca3 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -122,6 +122,11 @@ input[type="file"] {
   line-height: 28px;
 }
 
+// Reset line-height for IE
+input[type="file"] {
+  line-height: 18px \9;
+}
+
 // Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-- 
cgit v1.2.3


From b327420e524691808b59fa2d0d552e5ec65e2a45 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 20:58:10 -0800
Subject: update comment to reflect ie support

---
 docs/assets/bootstrap.zip     | Bin 52705 -> 52705 bytes
 docs/assets/css/bootstrap.css |   2 +-
 less/forms.less               |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 48e48f502..f107f2521 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 13af821b4..1f2aae23e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -660,7 +660,7 @@ input:focus, textarea:focus {
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
   outline: thin dotted \9;
-  /* IE6-8 */
+  /* IE6-9 */
 
 }
 input[type="file"]:focus,
diff --git a/less/forms.less b/less/forms.less
index 7f076aca3..81833b064 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -207,7 +207,7 @@ textarea:focus {
   @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
   .box-shadow(@shadow);
   outline: 0;
-  outline: thin dotted \9; /* IE6-8 */
+  outline: thin dotted \9; /* IE6-9 */
 }
 input[type="file"]:focus,
 input[type="radio"]:focus,
-- 
cgit v1.2.3


From 2eedf60d6284f8eef256999d2a59dd18bcbd2b2a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 22:34:41 -0800
Subject: write out icon classes explicitly to enable find via browser

---
 docs/assets/bootstrap.zip              | Bin 52705 -> 52705 bytes
 docs/assets/css/docs.css               |  20 +--
 docs/base-css.html                     | 260 ++++++++++++++++-----------------
 docs/templates/pages/base-css.mustache | 260 ++++++++++++++++-----------------
 4 files changed, 258 insertions(+), 282 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index f107f2521..1619fc54f 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 4cdbb0c7c..a532d0819 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -543,28 +543,12 @@ form.well {
 /* Icons
 ------------------------- */
 .the-icons {
-  margin-bottom: 18px;
-}
-.the-icons i {
-  display: block;
-  margin-bottom: 5px;
+  margin-left: 0;
+  list-style: none;
 }
 .the-icons i:hover {
   background-color: rgba(255,0,0,.25);
 }
-.the-icons i:after {
-  display: block;
-  content: attr(class);
-  font-style: normal;
-  margin-left: 20px;
-  width: 140px;
-}
-#javascript input[type=checkbox] {
-  position: relative;
-  top: -1px;
-  display: inline;
-  margin-left: 6px;
-}
 
 /* Eaxmples page
 ------------------------- */
diff --git a/docs/base-css.html b/docs/base-css.html
index 88d98851c..845f0460e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1358,144 +1358,140 @@ For example, <code>section</code> should be wrapped as inline.
   
            
   
            
     
            
-      
            
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
            
+      
              
+        
            •  icon-glass
              • 
+        
            •  icon-music
              • 
+        
            •  icon-search
              • 
+        
            •  icon-envelope
              • 
+        
            •  icon-heart
              • 
+        
            •  icon-star
              • 
+        
            •  icon-star-empty
              • 
+        
            •  icon-user
              • 
+        
            •  icon-film
              • 
+        
            •  icon-th-large
              • 
+        
            •  icon-th
              • 
+        
            •  icon-th-list
              • 
+        
            •  icon-ok
              • 
+        
            •  icon-remove
              • 
+        
            •  icon-zoom-in
              • 
+        
            •  icon-zoom-out
              • 
+        
            •  icon-off
              • 
+        
            •  icon-signal
              • 
+        
            •  icon-cog
              • 
+        
            •  icon-trash
              • 
+        
            •  icon-home
              • 
+        
            •  icon-file
              • 
+        
            •  icon-time
              • 
+        
            •  icon-road
              • 
+        
            •  icon-download-alt
              • 
+        
            •  icon-download
              • 
+        
            •  icon-upload
              • 
+        
            •  icon-inbox
              • 
+        
            •  icon-play-circle
              • 
+        
            •  icon-repeat
              • 
+      
            
     
            
     
            
-      
            
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
            
+      
              
+        
            •  icon-refresh
              • 
+        
            •  icon-list-alt
              • 
+        
            •  icon-lock
              • 
+        
            •  icon-flag
              • 
+        
            •  icon-headphones
              • 
+        
            •  icon-volume-off
              • 
+        
            •  icon-volume-down
              • 
+        
            •  icon-volume-up
              • 
+        
            •  icon-qrcode
              • 
+        
            •  icon-barcode
              • 
+        
            •  icon-tag
              • 
+        
            •  icon-tags
              • 
+        
            •  icon-book
              • 
+        
            •  icon-bookmark
              • 
+        
            •  icon-print
              • 
+        
            •  icon-camera
              • 
+        
            •  icon-font
              • 
+        
            •  icon-bold
              • 
+        
            •  icon-italic
              • 
+        
            •  icon-text-height
              • 
+        
            •  icon-text-width
              • 
+        
            •  icon-align-left
              • 
+        
            •  icon-align-center
              • 
+        
            •  icon-align-right
              • 
+        
            •  icon-align-justify
              • 
+        
            •  icon-list
              • 
+        
            •  icon-indent-left
              • 
+        
            •  icon-indent-right
              • 
+        
            •  icon-facetime-video
              • 
+        
            •  icon-picture
              • 
+      
            
     
            
     
            
-      
            
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
            
+      
              
+        
            •  icon-pencil
              • 
+        
            •  icon-map-marker
              • 
+        
            •  icon-adjust
              • 
+        
            •  icon-tint
              • 
+        
            •  icon-edit
              • 
+        
            •  icon-share
              • 
+        
            •  icon-check
              • 
+        
            •  icon-move
              • 
+        
            •  icon-step-backward
              • 
+        
            •  icon-fast-backward
              • 
+        
            •  icon-backward
              • 
+        
            •  icon-play
              • 
+        
            •  icon-pause
              • 
+        
            •  icon-stop
              • 
+        
            •  icon-forward
              • 
+        
            •  icon-fast-forward
              • 
+        
            •  icon-step-forward
              • 
+        
            •  icon-eject
              • 
+        
            •  icon-chevron-left
              • 
+        
            •  icon-chevron-right
              • 
+        
            •  icon-plus-sign
              • 
+        
            •  icon-minus-sign
              • 
+        
            •  icon-remove-sign
              • 
+        
            •  icon-ok-sign
              • 
+        
            •  icon-question-sign
              • 
+        
            •  icon-info-sign
              • 
+        
            •  icon-screenshot
              • 
+        
            •  icon-remove-circle
              • 
+        
            •  icon-ok-circle
              • 
+        
            •  icon-ban-circle
              • 
+      
            
     
            
     
            
-      
            
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
            
+      
              
+        
            •  icon-arrow-left
              • 
+        
            •  icon-arrow-right
              • 
+        
            •  icon-arrow-up
              • 
+        
            •  icon-arrow-down
              • 
+        
            •  icon-share-alt
              • 
+        
            •  icon-resize-full
              • 
+        
            •  icon-resize-small
              • 
+        
            •  icon-plus
              • 
+        
            •  icon-minus
              • 
+        
            •  icon-asterisk
              • 
+        
            •  icon-exclamation-sign
              • 
+        
            •  icon-gift
              • 
+        
            •  icon-leaf
              • 
+        
            •  icon-fire
              • 
+        
            •  icon-eye-open
              • 
+        
            •  icon-eye-close
              • 
+        
            •  icon-warning-sign
              • 
+        
            •  icon-plane
              • 
+        
            •  icon-calendar
              • 
+        
            •  icon-random
              • 
+        
            •  icon-comment
              • 
+        
            •  icon-magnet
              • 
+        
            •  icon-chevron-up
              • 
+        
            •  icon-chevron-down
              • 
+        
            •  icon-retweet
              • 
+        
            •  icon-shopping-cart
              • 
+        
            •  icon-folder-close
              • 
+        
            •  icon-folder-open
              • 
+        
            •  icon-resize-vertical
              • 
+        
            •  icon-resize-horizontal
              • 
+      
            
     
            
   
            
   
            
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 97c2255e6..04d2c7c07 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1282,144 +1282,140 @@
   
            
   
            
     
            
-      
            
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
            
+      
              
+        
            •  icon-glass
              • 
+        
            •  icon-music
              • 
+        
            •  icon-search
              • 
+        
            •  icon-envelope
              • 
+        
            •  icon-heart
              • 
+        
            •  icon-star
              • 
+        
            •  icon-star-empty
              • 
+        
            •  icon-user
              • 
+        
            •  icon-film
              • 
+        
            •  icon-th-large
              • 
+        
            •  icon-th
              • 
+        
            •  icon-th-list
              • 
+        
            •  icon-ok
              • 
+        
            •  icon-remove
              • 
+        
            •  icon-zoom-in
              • 
+        
            •  icon-zoom-out
              • 
+        
            •  icon-off
              • 
+        
            •  icon-signal
              • 
+        
            •  icon-cog
              • 
+        
            •  icon-trash
              • 
+        
            •  icon-home
              • 
+        
            •  icon-file
              • 
+        
            •  icon-time
              • 
+        
            •  icon-road
              • 
+        
            •  icon-download-alt
              • 
+        
            •  icon-download
              • 
+        
            •  icon-upload
              • 
+        
            •  icon-inbox
              • 
+        
            •  icon-play-circle
              • 
+        
            •  icon-repeat
              • 
+      
            
     
            
     
            
-      
            
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
            
+      
              
+        
            •  icon-refresh
              • 
+        
            •  icon-list-alt
              • 
+        
            •  icon-lock
              • 
+        
            •  icon-flag
              • 
+        
            •  icon-headphones
              • 
+        
            •  icon-volume-off
              • 
+        
            •  icon-volume-down
              • 
+        
            •  icon-volume-up
              • 
+        
            •  icon-qrcode
              • 
+        
            •  icon-barcode
              • 
+        
            •  icon-tag
              • 
+        
            •  icon-tags
              • 
+        
            •  icon-book
              • 
+        
            •  icon-bookmark
              • 
+        
            •  icon-print
              • 
+        
            •  icon-camera
              • 
+        
            •  icon-font
              • 
+        
            •  icon-bold
              • 
+        
            •  icon-italic
              • 
+        
            •  icon-text-height
              • 
+        
            •  icon-text-width
              • 
+        
            •  icon-align-left
              • 
+        
            •  icon-align-center
              • 
+        
            •  icon-align-right
              • 
+        
            •  icon-align-justify
              • 
+        
            •  icon-list
              • 
+        
            •  icon-indent-left
              • 
+        
            •  icon-indent-right
              • 
+        
            •  icon-facetime-video
              • 
+        
            •  icon-picture
              • 
+      
            
     
            
     
            
-      
            
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
            
+      
              
+        
            •  icon-pencil
              • 
+        
            •  icon-map-marker
              • 
+        
            •  icon-adjust
              • 
+        
            •  icon-tint
              • 
+        
            •  icon-edit
              • 
+        
            •  icon-share
              • 
+        
            •  icon-check
              • 
+        
            •  icon-move
              • 
+        
            •  icon-step-backward
              • 
+        
            •  icon-fast-backward
              • 
+        
            •  icon-backward
              • 
+        
            •  icon-play
              • 
+        
            •  icon-pause
              • 
+        
            •  icon-stop
              • 
+        
            •  icon-forward
              • 
+        
            •  icon-fast-forward
              • 
+        
            •  icon-step-forward
              • 
+        
            •  icon-eject
              • 
+        
            •  icon-chevron-left
              • 
+        
            •  icon-chevron-right
              • 
+        
            •  icon-plus-sign
              • 
+        
            •  icon-minus-sign
              • 
+        
            •  icon-remove-sign
              • 
+        
            •  icon-ok-sign
              • 
+        
            •  icon-question-sign
              • 
+        
            •  icon-info-sign
              • 
+        
            •  icon-screenshot
              • 
+        
            •  icon-remove-circle
              • 
+        
            •  icon-ok-circle
              • 
+        
            •  icon-ban-circle
              • 
+      
            
     
            
     
            
-      
            
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
            
+      
              
+        
            •  icon-arrow-left
              • 
+        
            •  icon-arrow-right
              • 
+        
            •  icon-arrow-up
              • 
+        
            •  icon-arrow-down
              • 
+        
            •  icon-share-alt
              • 
+        
            •  icon-resize-full
              • 
+        
            •  icon-resize-small
              • 
+        
            •  icon-plus
              • 
+        
            •  icon-minus
              • 
+        
            •  icon-asterisk
              • 
+        
            •  icon-exclamation-sign
              • 
+        
            •  icon-gift
              • 
+        
            •  icon-leaf
              • 
+        
            •  icon-fire
              • 
+        
            •  icon-eye-open
              • 
+        
            •  icon-eye-close
              • 
+        
            •  icon-warning-sign
              • 
+        
            •  icon-plane
              • 
+        
            •  icon-calendar
              • 
+        
            •  icon-random
              • 
+        
            •  icon-comment
              • 
+        
            •  icon-magnet
              • 
+        
            •  icon-chevron-up
              • 
+        
            •  icon-chevron-down
              • 
+        
            •  icon-retweet
              • 
+        
            •  icon-shopping-cart
              • 
+        
            •  icon-folder-close
              • 
+        
            •  icon-folder-open
              • 
+        
            •  icon-resize-vertical
              • 
+        
            •  icon-resize-horizontal
              • 
+      
            
     
            
   
            
   
            
-- 
cgit v1.2.3


From ed07a4d0ce0e769ef6efbd8d465670b26a0a5e37 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 12 Feb 2012 11:06:50 -0800
Subject: add note about popover placement

---
 docs/assets/bootstrap.zip                | Bin 52560 -> 52560 bytes
 docs/javascript.html                     |   4 ++--
 docs/templates/pages/javascript.mustache |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ed47cebd5..c850abc89 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index 06ce514a1..861c18c1a 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -733,7 +733,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
            
-               
+               
@@ -836,7 +836,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
-               
+               
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 705b35b47..88c90ce11 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -657,7 +657,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
-               
+               
@@ -760,7 +760,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
-               
+               
-- 
cgit v1.2.3


From a72ef967ba7e4870fb1d737dedf8bf8a10ae6587 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 11:08:33 -0800
Subject: re-add protocol to the shim

---
 docs/assets/bootstrap.zip      | Bin 52705 -> 52705 bytes
 docs/base-css.html             |  10 +++++-----
 docs/components.html           |  10 +++++-----
 docs/download.html             |  10 +++++-----
 docs/examples.html             |  10 +++++-----
 docs/index.html                |  10 +++++-----
 docs/javascript.html           |  10 +++++-----
 docs/less.html                 |  10 +++++-----
 docs/scaffolding.html          |  10 +++++-----
 docs/templates/layout.mustache |  10 +++++-----
 docs/upgrading.html            |  10 +++++-----
 11 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 1619fc54f..0b1ec16c2 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 845f0460e..4678bd616 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/components.html b/docs/components.html
index cb41c736e..a028c65ed 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/download.html b/docs/download.html
index c385046dd..4fc95a239 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/examples.html b/docs/examples.html
index aabd65b46..2235c527c 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/index.html b/docs/index.html
index 95661da41..af624c24d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/javascript.html b/docs/javascript.html
index 1d0afb9e0..21f27263b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/less.html b/docs/less.html
index 0d1527fb3..09325df92 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 58bf88b24..26449a532 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index a885b25be..954a12fe1 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 5416b9987..5503d3afb 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
-- 
cgit v1.2.3


From c02df9390330b3fa6b9c7cd0b4390093c163fae9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 11:08:58 -0800
Subject: move shim after css

---
 docs/assets/bootstrap.zip      | Bin 52705 -> 52705 bytes
 docs/base-css.html             |  10 +++++-----
 docs/components.html           |  10 +++++-----
 docs/download.html             |  10 +++++-----
 docs/examples.html             |  10 +++++-----
 docs/index.html                |  10 +++++-----
 docs/javascript.html           |  10 +++++-----
 docs/less.html                 |  10 +++++-----
 docs/scaffolding.html          |  10 +++++-----
 docs/templates/layout.mustache |  10 +++++-----
 docs/upgrading.html            |  10 +++++-----
 11 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0b1ec16c2..cb1adbca6 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 4678bd616..cbe353985 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/components.html b/docs/components.html
index a028c65ed..2af9df756 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/download.html b/docs/download.html
index 4fc95a239..9159787d0 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/examples.html b/docs/examples.html
index 2235c527c..76eb4b59a 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/index.html b/docs/index.html
index af624c24d..a914f677f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/javascript.html b/docs/javascript.html
index 21f27263b..855cd82bc 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/less.html b/docs/less.html
index 09325df92..97847cc9d 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 26449a532..ba79465af 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 954a12fe1..832983e16 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 5503d3afb..0c9ab1673 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
-- 
cgit v1.2.3


From a2bc22bad5fd1b7ab6bba10087cea36aad63c550 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 11:14:13 -0800
Subject: standardize default button gradient styles to match other buttons,
 reset it's IE filter to improve IE7 hover

---
 docs/assets/bootstrap.zip     | Bin 52705 -> 52743 bytes
 docs/assets/css/bootstrap.css |  30 ++++++++++++++++++++++--------
 less/buttons.less             |   3 ++-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index cb1adbca6..c592991f3 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 1f2aae23e..a88db6685 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1693,15 +1693,18 @@ table .span12 {
   text-align: center;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
   vertical-align: middle;
-  background-color: #fafafa;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-repeat: no-repeat;
+  background-color: #f5f5f5;
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(top, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   -webkit-border-radius: 4px;
@@ -1711,8 +1714,19 @@ table .span12 {
   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   cursor: pointer;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   *margin-left: .3em;
 }
+.btn:hover,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  background-color: #e6e6e6;
+}
+.btn:active, .btn.active {
+  background-color: #cccccc \9;
+}
 .btn:first-child {
   *margin-left: 0;
 }
diff --git a/less/buttons.less b/less/buttons.less
index 0dc9e374b..ff8168557 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -16,7 +16,7 @@
   text-align: center;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   vertical-align: middle;
-  #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
+  .buttonBackground(@white, darken(@white, 10%));
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   .border-radius(4px);
@@ -25,6 +25,7 @@
   cursor: pointer;
 
   // Give IE7 some love
+  .reset-filter();
   .ie7-restore-left-whitespace();
 }
 
-- 
cgit v1.2.3


From 5b4a29d84e6290a93db98da34b89776a9740e455 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 12 Feb 2012 11:15:12 -0800
Subject: honor data attributes set on modal as well

---
 docs/assets/bootstrap.zip         | Bin 52705 -> 52712 bytes
 docs/assets/js/bootstrap-modal.js |   2 +-
 js/bootstrap-modal.js             |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 18f938cf9..073df93f0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js
index 180f0b64d..ffbed0d2e 100644
--- a/docs/assets/js/bootstrap-modal.js
+++ b/docs/assets/js/bootstrap-modal.js
@@ -177,7 +177,7 @@
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, typeof option == 'object' && option)
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
       if (!data) $this.data('modal', (data = new Modal(this, options)))
       if (typeof option == 'string') data[option]()
       else if (options.show) data.show()
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 180f0b64d..ffbed0d2e 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -177,7 +177,7 @@
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, typeof option == 'object' && option)
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
       if (!data) $this.data('modal', (data = new Modal(this, options)))
       if (typeof option == 'string') data[option]()
       else if (options.show) data.show()
-- 
cgit v1.2.3


From b9d5ceb14bf77e62dd8b017f76b72a3a14643620 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 11:17:46 -0800
Subject: edit comment on IE7-8 support of :focus in navbar-search

---
 docs/assets/bootstrap.zip | Bin 52743 -> 52743 bytes
 less/navbar.less          |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c592991f3..0c5e699d1 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/less/navbar.less b/less/navbar.less
index 3ad2a0743..cd637acac 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -133,7 +133,7 @@
       background-color: @grayLight;
       background-color: rgba(255,255,255,.5);
     }
-    // Focus states (we use .focused since IE8 and down doesn't support :focus)
+    // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus,
     &.focused {
       padding: 5px 10px;
-- 
cgit v1.2.3


From 24df7f1e1d9cc018eca5f7adcca15500f5503022 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 13:20:08 -0800
Subject: update ff comment in buttons

---
 docs/assets/bootstrap.zip | Bin 52743 -> 52743 bytes
 less/buttons.less         |   2 ++
 2 files changed, 2 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0c5e699d1..28407b9a3 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/less/buttons.less b/less/buttons.less
index ff8168557..5fc423183 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -148,6 +148,8 @@
 
 button.btn,
 input[type="submit"].btn {
+
+  // Firefox 3.6 only I believe
   &::-moz-focus-inner {
     padding: 0;
     border: 0;
-- 
cgit v1.2.3


From 86b6ea4b5f2919c6dd962301b94af4e4096dbb16 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 13:33:23 -0800
Subject: lower z-index of fixed subnav to prevent overlap of dropdown items in
 .navbar-fixed

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

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 87fa88eef..f6a388c23 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -181,7 +181,7 @@ hr.soften {
     top: 40px;
     left: 0;
     right: 0;
-    z-index: 1030;
+    z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
     border-color: #d5d5d5;
     border-width: 0 0 1px; /* drop the border on the fixed edges */
     -webkit-border-radius: 0;
-- 
cgit v1.2.3


From a9e469e75aba9edb6e4b0eb29f0a51dbef3167b7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 14:01:58 -0800
Subject: add navbar background hover variable and fix uneditable-input with
 append/prepend controls

---
 docs/assets/bootstrap.zip     | Bin 52750 -> 52755 bytes
 docs/assets/css/bootstrap.css |   1 +
 less/forms.less               |   1 +
 less/navbar.less              |   2 +-
 less/variables.less           |   1 +
 5 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 89446db2c..22be76caf 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index a88db6685..b1a1d2611 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -913,6 +913,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   border-radius: 3px 0 0 3px;
 }
 .input-append .uneditable-input {
+  border-left-color: #eee;
   border-right-color: #ccc;
 }
 .input-append .add-on {
diff --git a/less/forms.less b/less/forms.less
index 81833b064..eb98f1bcb 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -395,6 +395,7 @@ select:focus:required:invalid {
     .border-radius(3px 0 0 3px);
   }
   .uneditable-input {
+    border-left-color: #eee;
     border-right-color: #ccc;    
   }
   .add-on {
diff --git a/less/navbar.less b/less/navbar.less
index cd637acac..35c209fc4 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -194,7 +194,7 @@
 }
 // Hover
 .navbar .nav > li > a:hover {
-  background-color: transparent;
+  background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
   color: @navbarLinkColorHover;
   text-decoration: none;
 }
diff --git a/less/variables.less b/less/variables.less
index ced64d7cd..3d448ab21 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -68,6 +68,7 @@
 @navbarHeight:                    40px;
 @navbarBackground:                @grayDarker;
 @navbarBackgroundHighlight:       @grayDark;
+@navbarLinkBackgroundHover:       transparent;
 
 @navbarText:                      @grayLight;
 @navbarLinkColor:                 @grayLight;
-- 
cgit v1.2.3


From 0ff88f2db3b9fa4604886494a711d74652a2fb4f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 14:09:13 -0800
Subject: enable the use of .nav-header in dropdowns per #1827

---
 docs/assets/bootstrap.zip                | Bin 52755 -> 52782 bytes
 docs/assets/css/bootstrap.css            |  26 +++++++++++++++-----------
 docs/components.html                     |   2 ++
 docs/templates/pages/components.mustache |   2 ++
 less/navs.less                           |  28 +++++++++++++++++-----------
 5 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 22be76caf..a41a61541 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b1a1d2611..5a97f23a6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2130,27 +2130,31 @@ button.btn.small, input[type="submit"].btn.small {
   text-decoration: none;
   background-color: #eeeeee;
 }
+.nav .nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+.nav li + .nav-header {
+  margin-top: 9px;
+}
 .nav-list {
   padding-left: 14px;
   padding-right: 14px;
   margin-bottom: 0;
 }
 .nav-list > li > a, .nav-list .nav-header {
-  display: block;
-  padding: 3px 15px;
   margin-left: -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
-.nav-list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 18px;
-  color: #999999;
-  text-transform: uppercase;
-}
-.nav-list > li + .nav-header {
-  margin-top: 9px;
+.nav-list > li > a {
+  padding: 3px 15px;
 }
 .nav-list .active > a, .nav-list .active > a:hover {
   color: #ffffff;
diff --git a/docs/components.html b/docs/components.html
index 2af9df756..37f1a6511 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -771,7 +771,9 @@
                 
          • Another action
            • 
                 
          • Something else here
            • 
                 
          • 
+                
          • Nav header
            • 
                 
          • Separated link
            • 
+                
          • One more separated link
            • 
               
             
           
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 62a7083b6..c854ad0d0 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -695,7 +695,9 @@
                 
          • {{_i}}Another action{{/i}}
            • 
                 
          • {{_i}}Something else here{{/i}}
            • 
                 
          • 
+                
          • Nav header
            • 
                 
          • {{_i}}Separated link{{/i}}
            • 
+                
          • {{_i}}One more separated link{{/i}}
            • 
               
             
           
diff --git a/less/navs.less b/less/navs.less
index 0d37ea388..06219fa62 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -21,6 +21,21 @@
   background-color: @grayLighter;
 }
 
+// Nav headers (for dropdowns and lists)
+.nav .nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: @baseLineHeight;
+  color: @grayLight;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  text-transform: uppercase;
+}
+// Space them out when they follow another list item (link)
+.nav li + .nav-header {
+  margin-top: 9px;
+}
 
 
 // NAV LIST
@@ -33,21 +48,12 @@
 }
 .nav-list > li > a,
 .nav-list .nav-header {
-  display: block;
-  padding: 3px 15px;
   margin-left:  -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
-.nav-list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @grayLight;
-  text-transform: uppercase;
-}
-.nav-list > li + .nav-header {
-  margin-top: 9px;
+.nav-list > li > a {
+  padding: 3px 15px;
 }
 .nav-list .active > a,
 .nav-list .active > a:hover {
-- 
cgit v1.2.3


From 1b32e982ade1fc5275a851b711b45f6a0ed21b0c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 14:47:09 -0800
Subject: add hero-unit docs per #1880

---
 docs/assets/bootstrap.zip                | Bin 52782 -> 52782 bytes
 docs/components.html                     |  37 +++++++++++++++++++++++++++++++
 docs/templates/pages/components.mustache |  37 +++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a41a61541..ca001c1e6 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 37f1a6511..10725024b 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -98,6 +98,7 @@
         
       
       
          • Labels
            • 
+      
          • Hero
            • 
       
          • Thumbnails
            • 
       
          • Alerts
            • 
       
          • Progress bars
            • 
@@ -1137,6 +1138,42 @@
 
 
 
+
+
            
+  
            
+    
            Hero unit Jumbotron for your site's tagline
            
+  
            
+  
            
+    
            
+      
            About
            
+      
            Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.
            
+      
            Markup
            
+      
            Wrap your content in a div like so:
            
+
            +<div class="hero-unit">
+  <h1>Heading</h1>
+  <p>Tagline</p>
+  <p>
+    <a class="btn btn-primary btn-large">
+      Learn more
+    </a>
+  </p>
+</div>
+
            
+    
            
+    
            
+      
            
+        
            Hello, world!
            
+        
            This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.
            
+        
            Learn more
            
+      
            
+    
            
+  
            
+
            
+
+
+
 
 
            
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index c854ad0d0..003a3ae3c 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -22,6 +22,7 @@
         
       
       
          • {{_i}}Labels{{/i}}
            • 
+      
          • {{_i}}Hero{{/i}}
            • 
       
          • {{_i}}Thumbnails{{/i}}
            • 
       
          • {{_i}}Alerts{{/i}}
            • 
       
          • {{_i}}Progress bars{{/i}}
            • 
@@ -1061,6 +1062,42 @@
 
 
 
+
+
            
+  
            
+    
            {{_i}}Hero unit{{/i}} {{_i}}Jumbotron for your site's tagline{{/i}}
            
+  
            
+  
            
+    
            
+      
            {{_i}}About{{/i}}
            
+      
            {{_i}}Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.{{/i}}
            
+      
            {{_i}}Markup{{/i}}
            
+      
            {{_i}}Wrap your content in a div like so:{{/i}}
            
+
            +<div class="hero-unit">
+  <h1>{{_i}}Heading{{/i}}</h1>
+  <p>{{_i}}Tagline{{/i}}</p>
+  <p>
+    <a class="btn btn-primary btn-large">
+      {{_i}}Learn more{{/i}}
+    </a>
+  </p>
+</div>
+
            
+    
            
+    
            
+      
            
+        
            {{_i}}Hello, world!{{/i}}
            
+        
            {{_i}}This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.{{/i}}
            
+        
            {{_i}}Learn more{{/i}}
            
+      
            
+    
            
+  
            
+
            
+
+
+
 
 
            
-- 
cgit v1.2.3


From a57dbada0f17bc3dfd4a77de436a5e590fb0d1e3 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 15:18:20 -0800
Subject: change classname from .btn-dark to .btn-inverse, change use text

---
 docs/assets/bootstrap.zip              | Bin 52782 -> 53038 bytes
 docs/assets/css/bootstrap.css          |  34 ++++++++++++++++++++++++++++++---
 docs/base-css.html                     |   5 +++++
 docs/templates/pages/base-css.mustache |   8 ++++----
 less/button-groups.less                |   2 +-
 less/buttons.less                      |   8 ++++----
 6 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ca001c1e6..94e2fa1f3 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5a97f23a6..acd3a396e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1794,7 +1794,9 @@ table .span12 {
 .btn-success,
 .btn-success:hover,
 .btn-info,
-.btn-info:hover {
+.btn-info:hover,
+.btn-inverse,
+.btn-inverse:hover {
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   color: #ffffff;
 }
@@ -1802,7 +1804,8 @@ table .span12 {
 .btn-warning.active,
 .btn-danger.active,
 .btn-success.active,
-.btn-info.active {
+.btn-info.active,
+.btn-dark.active {
   color: rgba(255, 255, 255, 0.75);
 }
 .btn-primary {
@@ -1925,6 +1928,30 @@ table .span12 {
 .btn-info:active, .btn-info.active {
   background-color: #24748c \9;
 }
+.btn-inverse {
+  background-color: #393939;
+  background-image: -moz-linear-gradient(top, #454545, #262626);
+  background-image: -ms-linear-gradient(top, #454545, #262626);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626));
+  background-image: -webkit-linear-gradient(top, #454545, #262626);
+  background-image: -o-linear-gradient(top, #454545, #262626);
+  background-image: linear-gradient(top, #454545, #262626);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0);
+  border-color: #262626 #262626 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-inverse:hover,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  background-color: #262626;
+}
+.btn-inverse:active, .btn-inverse.active {
+  background-color: #0c0c0c \9;
+}
 button.btn, input[type="submit"].btn {
   *padding-top: 2px;
   *padding-bottom: 2px;
@@ -2057,7 +2084,8 @@ button.btn.small, input[type="submit"].btn.small {
 .btn-primary .caret,
 .btn-danger .caret,
 .btn-info .caret,
-.btn-success .caret {
+.btn-success .caret,
+.btn-inverse .caret {
   border-top-color: #ffffff;
   opacity: 0.75;
   filter: alpha(opacity=75);
diff --git a/docs/base-css.html b/docs/base-css.html
index cbe353985..292e4a396 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1285,6 +1285,11 @@ For example, <code>section</code> should be wrapped as inline.
         
            
+      
+  	  
+        
+        
+        
            
         
           
            
             Landscape tablets
             768px to 980px44px42px
             20px
           
            
           
            
             {{_i}}Landscape tablets{{/i}}
             768px to 980px44px42px
             20px
           
            
           
            
              
            
                placementstringstring|function
                'top'
                how to position the tooltip - top | bottom | left | right
              
            
              
            
                placementstringstring|function
                'right'
                how to position the popover - top | bottom | left | right
              
            
              
            
                {{_i}}placement{{/i}}{{_i}}string{{/i}}{{_i}}string|function{{/i}}
                'top'
                {{_i}}how to position the tooltip{{/i}} - top | bottom | left | right
              
            
              
            
                {{_i}}placement{{/i}}{{_i}}string{{/i}}{{_i}}string|function{{/i}}
                'right'
                {{_i}}how to position the popover{{/i}} - top | bottom | left | right
              
            Danger
         .btn-danger
         Indicates a dangerous or potentially negative action
            Inverse.btn-inverseAlternate dark gray button, not tied to a semantic action or use
       
            
     
   
            
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 7f5243dde..cb79496a8 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1210,10 +1210,10 @@
         .btn-danger
         {{_i}}Indicates a dangerous or potentially negative action{{/i}}
       
-	  
-        {{_i}}Dark{{/i}}
-        .btn-dark
-        {{_i}}Indicates a potential abort or black magic{{/i}}
+  	  
+        {{_i}}Inverse{{/i}}
+        .btn-inverse
+        {{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}
       
     
   
diff --git a/less/button-groups.less b/less/button-groups.less
index d8957c52d..a04220a9a 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -134,7 +134,7 @@
 .btn-danger,
 .btn-info,
 .btn-success,
-.btn-dark {
+.btn-inverse {
   .caret {
     border-top-color: @white;
     .opacity(75);
diff --git a/less/buttons.less b/less/buttons.less
index 0ac2be67a..292e04626 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -108,8 +108,8 @@
 .btn-success:hover,
 .btn-info,
 .btn-info:hover,
-.btn-dark,
-.btn-dark:hover {
+.btn-inverse,
+.btn-inverse:hover {
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   color: @white;
 }
@@ -144,8 +144,8 @@
 .btn-info {
   .buttonBackground(#5bc0de, #2f96b4);
 }
-// Dark appears as black
-.btn-dark {
+// Inverse appears as dark gray
+.btn-inverse {
   .buttonBackground(#454545, #262626);
 }
 
-- 
cgit v1.2.3


From 163c98ea7e321ce3a1b38128cfb2bec6cd76e6de Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 15:43:04 -0800
Subject: clean up modals.less comments, add new class for optional use on
 modal forms to remove bottom margin

---
 docs/assets/bootstrap.zip     | Bin 53038 -> 53053 bytes
 docs/assets/css/bootstrap.css |   3 +++
 less/modals.less              |  11 +++++++++++
 3 files changed, 14 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 94e2fa1f3..8c01169dc 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index acd3a396e..754e9af2d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2888,6 +2888,9 @@ button.btn.small, input[type="submit"].btn.small {
 .modal-body {
   padding: 15px;
 }
+.modal-body .modal-form {
+  margin-bottom: 0;
+}
 .modal-footer {
   padding: 14px 15px 15px;
   margin-bottom: 0;
diff --git a/less/modals.less b/less/modals.less
index aa14675ed..d1e06dc26 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -1,6 +1,7 @@
 // MODALS
 // ------
 
+// Recalculate z-index where appropriate
 .modal-open {
   .dropdown-menu {  z-index: @zindexDropdown + @zindexModal; }
   .dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
@@ -8,6 +9,7 @@
   .tooltip       {  z-index: @zindexTooltip  + @zindexModal; }
 }
 
+// Background
 .modal-backdrop {
   position: fixed;
   top: 0;
@@ -25,6 +27,7 @@
   .opacity(80);
 }
 
+// Base modal
 .modal {
   position: fixed;
   top: 50%;
@@ -53,9 +56,17 @@
   // Close icon
   .close { margin-top: 2px; }
 }
+
+// Body (where all modal content resises)
 .modal-body {
   padding: 15px;
 }
+// Remove bottom margin if need be
+.modal-body .modal-form {
+  margin-bottom: 0;
+}
+
+// Footer (for actions)
 .modal-footer {
   padding: 14px 15px 15px;
   margin-bottom: 0;
-- 
cgit v1.2.3


From ac9ac4ddae7fc9f9c030d8ade789ec65d9a2ec05 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 15:49:04 -0800
Subject: add note to button dropdowns about js plugin dependency per #1746

---
 docs/assets/bootstrap.zip                | Bin 53053 -> 53053 bytes
 docs/components.html                     |   4 +++-
 docs/templates/pages/components.mustache |   4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8c01169dc..5a3e36935 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 10725024b..8cd2e58d8 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -248,7 +248,9 @@
             
          • Separated link
            •
          - + +
          +

          Heads up! Button dropdowns require the Bootstrap dropdown plugin to function.

          Example markup

          diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 003a3ae3c..34cc5980c 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -172,7 +172,9 @@
        • {{_i}}Separated link{{/i}}
        - + +
        +

        {{_i}}Heads up!{{/i}} {{_i}}Button dropdowns require the Bootstrap dropdown plugin to function.{{/i}}

        {{_i}}Example markup{{/i}}

        -- cgit v1.2.3 From 87ed82207ad10947c9f53b501b1fb40a1db7f56e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 16:04:02 -0800 Subject: update readme to clarify dependencies of make command, per #1756 --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b0f35480d..5c53cc267 100644 --- a/README.md +++ b/README.md @@ -54,12 +54,10 @@ Developers We have included a makefile with convenience methods for working with the Bootstrap library. + **build** - `make` -This will run the less compiler on the bootstrap lib and regenerate the docs dir. -The lessc compiler is required for this command to run. +Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages. Requires lessc and uglify-js. + **watch** - `make watch` -This is a convenience method for watching your less files and automatically building them whenever you save. -Watchr is required for this command to run. +This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem. Authors -- cgit v1.2.3 From 16f2e0e19e97b72d061b6c0041caad33cdd34067 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 16:05:25 -0800 Subject: add link to docs compiling section in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c53cc267..d492cd96f 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Developers We have included a makefile with convenience methods for working with the Bootstrap library. + **build** - `make` -Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages. Requires lessc and uglify-js. +Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages. Requires lessc and uglify-js. Read more in our docs » + **watch** - `make watch` This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem. -- cgit v1.2.3 From 5fc62c5fcc93ab36a419c35e72674fbf632b09c3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 16:59:29 -0800 Subject: clear up scaffolding page to separate fixed from fluid grid systems --- docs/assets/bootstrap.zip | Bin 53053 -> 53056 bytes docs/assets/css/bootstrap-responsive.css | 48 ++++++------- docs/assets/css/bootstrap.css | 24 +++---- docs/scaffolding.html | 116 ++++++++++++++++++++++++++---- docs/templates/pages/scaffolding.mustache | 116 ++++++++++++++++++++++++++---- less/mixins.less | 28 ++++---- 6 files changed, 256 insertions(+), 76 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 5a3e36935..b15d66b4a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index c8c630296..de454224e 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -205,40 +205,40 @@ .row-fluid > [class*="span"]:first-child { margin-left: 0; } - .row-fluid .span1 { + .row-fluid > .span1 { width: 5.801104972%; } - .row-fluid .span2 { + .row-fluid > .span2 { width: 14.364640883%; } - .row-fluid .span3 { + .row-fluid > .span3 { width: 22.928176794%; } - .row-fluid .span4 { + .row-fluid > .span4 { width: 31.491712705%; } - .row-fluid .span5 { + .row-fluid > .span5 { width: 40.055248616%; } - .row-fluid .span6 { + .row-fluid > .span6 { width: 48.618784527%; } - .row-fluid .span7 { + .row-fluid > .span7 { width: 57.182320438000005%; } - .row-fluid .span8 { + .row-fluid > .span8 { width: 65.74585634900001%; } - .row-fluid .span9 { + .row-fluid > .span9 { width: 74.30939226%; } - .row-fluid .span10 { + .row-fluid > .span10 { width: 82.87292817100001%; } - .row-fluid .span11 { + .row-fluid > .span11 { width: 91.436464082%; } - .row-fluid .span12 { + .row-fluid > .span12 { width: 99.999999993%; } input.span1, textarea.span1, .uneditable-input.span1 { @@ -486,40 +486,40 @@ .row-fluid > [class*="span"]:first-child { margin-left: 0; } - .row-fluid .span1 { + .row-fluid > .span1 { width: 5.982905983%; } - .row-fluid .span2 { + .row-fluid > .span2 { width: 14.529914530000001%; } - .row-fluid .span3 { + .row-fluid > .span3 { width: 23.076923077%; } - .row-fluid .span4 { + .row-fluid > .span4 { width: 31.623931624%; } - .row-fluid .span5 { + .row-fluid > .span5 { width: 40.170940171000005%; } - .row-fluid .span6 { + .row-fluid > .span6 { width: 48.717948718%; } - .row-fluid .span7 { + .row-fluid > .span7 { width: 57.264957265%; } - .row-fluid .span8 { + .row-fluid > .span8 { width: 65.81196581200001%; } - .row-fluid .span9 { + .row-fluid > .span9 { width: 74.358974359%; } - .row-fluid .span10 { + .row-fluid > .span10 { width: 82.905982906%; } - .row-fluid .span11 { + .row-fluid > .span11 { width: 91.45299145300001%; } - .row-fluid .span12 { + .row-fluid > .span12 { width: 100%; } input.span1, textarea.span1, .uneditable-input.span1 { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 754e9af2d..61e67360c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -212,40 +212,40 @@ a:hover { .row-fluid > [class*="span"]:first-child { margin-left: 0; } -.row-fluid .span1 { +.row-fluid > .span1 { width: 6.382978723%; } -.row-fluid .span2 { +.row-fluid > .span2 { width: 14.89361702%; } -.row-fluid .span3 { +.row-fluid > .span3 { width: 23.404255317%; } -.row-fluid .span4 { +.row-fluid > .span4 { width: 31.914893614%; } -.row-fluid .span5 { +.row-fluid > .span5 { width: 40.425531911%; } -.row-fluid .span6 { +.row-fluid > .span6 { width: 48.93617020799999%; } -.row-fluid .span7 { +.row-fluid > .span7 { width: 57.446808505%; } -.row-fluid .span8 { +.row-fluid > .span8 { width: 65.95744680199999%; } -.row-fluid .span9 { +.row-fluid > .span9 { width: 74.468085099%; } -.row-fluid .span10 { +.row-fluid > .span10 { width: 82.97872339599999%; } -.row-fluid .span11 { +.row-fluid > .span11 { width: 91.489361693%; } -.row-fluid .span12 { +.row-fluid > .span12 { width: 99.99999998999999%; } .container { diff --git a/docs/scaffolding.html b/docs/scaffolding.html index ba79465af..18ec5fb42 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -81,7 +81,9 @@

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

        @@ -92,12 +94,11 @@ -
        +
        -

        Grid system 12 columns with a responsive twist

        +

        Default grid system 12 columns with a responsive twist

        -

        Default grid

        1
        1
        @@ -188,7 +189,87 @@
        -

        Fluid example

        + +
        +
        +<div class="row">
+  <div class="span12">
+    Level 1 of column
+    <div class="row">
+      <div class="span6">Level 2</div>
+      <div class="span6">Level 2</div>
+    </div>
+  </div>
+</div>
+
        +
        + + + + + + +
        +
        +

        Fluid grid system 12 responsive, percent-based columns

        +
        + +

        Fluid columns

        +
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        +
        +
        4
        +
        4
        +
        4
        +
        +
        +
        4
        +
        8
        +
        +
        +
        6
        +
        6
        +
        +
        +
        12
        +
        + +
        +
        +

        Percents, not pixels

        +

        The fluid grid system uses percents for column widths instead of fixed pixels. It also has the same responsive variations as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.

        +
        +
        +

        Fluid rows

        +

        Make any row fluid simply by changing .row to .row-fluid. The columns stay the exact same, making it super straightforward to flip between fixed and fluid layouts.

        +
        +
        +

        Markup

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

        Fluid nesting

        +
        +

        Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.

        @@ -206,10 +287,10 @@ 
        -<div class="row">
+<div class="row-fluid">
   <div class="span12">
     Level 1 of column
-    <div class="row">
+    <div class="row-fluid">
       <div class="span6">Level 2</div>
       <div class="span6">Level 2</div>
     </div>
@@ -219,7 +300,16 @@
        -

        Grid customization

        +
        + + + + +
        +
        +

        Grid customization

        +
        @@ -281,8 +371,8 @@

        Fixed layout

        The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.

        -
        -
        +
        + 
         <body>
@@ -295,9 +385,9 @@
     
        
       
        Fluid layout
        
       
        <div class="container-fluid"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.
        
-      
        
-        
        
-        
        
+      
        
+        
        
+        
        
       
        
 
         <div class="container-fluid">
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 74b824d9c..cc3cceea7 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -5,7 +5,9 @@
         
        {{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}
        
         
        
           
@@ -16,12 +18,11 @@
 
 
-
        
+
        
   
        
-    
        {{_i}}Grid system 12 columns with a responsive twist{{/i}}
        
+    
        {{_i}}Default grid system 12 columns with a responsive twist{{/i}}
        
   
        
 
-  
        {{_i}}Default grid{{/i}}
        
   
        
     
        1
        
     
        1
        
@@ -112,7 +113,87 @@
           
        
         
        
       
        
-      
        {{_i}}Fluid example{{/i}}
        
+    
        
+    
        
+
        +<div class="row">
+  <div class="span12">
+    {{_i}}Level 1 of column{{/i}}
+    <div class="row">
+      <div class="span6">{{_i}}Level 2{{/i}}</div>
+      <div class="span6">{{_i}}Level 2{{/i}}</div>
+    </div>
+  </div>
+</div>
+
        
+    
        
+
        + + + + + +
        +
        +

        {{_i}}Fluid grid system 12 responsive, percent-based columns{{/i}}

        +
        + +

        {{_i}}Fluid columns{{/i}}

        +
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        1
        +
        +
        +
        4
        +
        4
        +
        4
        +
        +
        +
        4
        +
        8
        +
        +
        +
        6
        +
        6
        +
        +
        +
        12
        +
        + +
        +
        +

        {{_i}}Percents, not pixels{{/i}}

        +

        {{_i}}The fluid grid system uses percents for column widths instead of fixed pixels. It also has the same responsive variations as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.{{/i}}

        +
        +
        +

        {{_i}}Fluid rows{{/i}}

        +

        {{_i}}Make any row fluid simply by changing .row to .row-fluid. The columns stay the exact same, making it super straightforward to flip between fixed and fluid layouts.{{/i}}

        +
        +
        +

        {{_i}}Markup{{/i}}

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

        {{_i}}Fluid nesting{{/i}}

        +
        +

        {{_i}}Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.{{/i}}

        @@ -130,10 +211,10 @@ 
        -<div class="row">
+<div class="row-fluid">
   <div class="span12">
     {{_i}}Level 1 of column{{/i}}
-    <div class="row">
+    <div class="row-fluid">
       <div class="span6">{{_i}}Level 2{{/i}}</div>
       <div class="span6">{{_i}}Level 2{{/i}}</div>
     </div>
@@ -143,7 +224,16 @@
        -

        {{_i}}Grid customization{{/i}}

        +
        + + + + +
        +
        +

        {{_i}}Grid customization{{/i}}

        +
        @@ -205,8 +295,8 @@

        {{_i}}Fixed layout{{/i}}

        {{_i}}The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.{{/i}}

        -
        -
        +
        + 
         <body>
@@ -219,9 +309,9 @@
     
        
       
        {{_i}}Fluid layout{{/i}}
        
       
        {{_i}}<div class="container-fluid"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}
        
-      
        
-        
        
-        
        
+      
        
+        
        
+        
        
       
        
 
         <div class="container-fluid">
diff --git a/less/mixins.less b/less/mixins.less
index fffb6c1ce..c2fc2c745 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -208,13 +208,13 @@
   // Setup the mixins to be used
   .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, @columns) {
     width: 1% * (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
-  } 
+  }
   .gridColumn(@fluidGridGutterWidth) {
     float: left;
     margin-left: @fluidGridGutterWidth;
   }
   // Take these values and mixins, and make 'em do their thang
-  .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) {      
+  .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) {
     // Row surrounds the columns
     .row-fluid {
       width: 100%;
@@ -228,18 +228,18 @@
         margin-left: 0;
       }
       // Default columns
-      .span1     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); }
-      .span2     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); }
-      .span3     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); }
-      .span4     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); }
-      .span5     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); }
-      .span6     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); }
-      .span7     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); }
-      .span8     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); }
-      .span9     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); }
-      .span10    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); }
-      .span11    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); }
-      .span12    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); }
+      > .span1     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); }
+      > .span2     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); }
+      > .span3     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); }
+      > .span4     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); }
+      > .span5     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); }
+      > .span6     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); }
+      > .span7     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); }
+      > .span8     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); }
+      > .span9     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); }
+      > .span10    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); }
+      > .span11    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); }
+      > .span12    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); }
     }
   }
 }
-- 
cgit v1.2.3


From 81d101a6a7195f8575296b19fbf4d36dd145a602 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 19:50:36 -0800
Subject: update docs on fixed nav per #1726

---
 docs/assets/bootstrap.zip                | Bin 53056 -> 53056 bytes
 docs/components.html                     |   4 +++-
 docs/templates/pages/components.mustache |   4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b15d66b4a..d9c4b4c60 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 8cd2e58d8..ac87f74b5 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -815,12 +815,14 @@
   </div>
 </div>
 
        
-      
        To make the navbar fixed to the top of the viewport, add .navbar-fixed-top to the outermost div, .navbar. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.
        
+      
        Fixed navbar
        
+      
        To make the navbar fixed to the top of the viewport, add .navbar-fixed-top to the outermost div, .navbar.
        
 
         <div class="navbar navbar-fixed-top">
   ...
 </div>
 
        
+      
        In your CSS, you will also need to account for the overlap it causes by adding 40px or more of padding to your <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.
        
       
        Brand name
        
       
        A simple link to show your brand or project name only requires an anchor tag.
        
 
        diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 34cc5980c..ec7ba2636 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -739,12 +739,14 @@
   </div>
 </div>
 
        
-      
        {{_i}}To make the navbar fixed to the top of the viewport, add .navbar-fixed-top to the outermost div, .navbar. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.{{/i}}
        
+      
        {{_i}}Fixed navbar{{/i}}
        
+      
        {{_i}}To make the navbar fixed to the top of the viewport, add .navbar-fixed-top to the outermost div, .navbar.{{/i}}
        
 
         <div class="navbar navbar-fixed-top">
   ...
 </div>
 
        
+      
        {{_i}}In your CSS, you will also need to account for the overlap it causes by adding 40px or more of padding to your <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}
        
       
        {{_i}}Brand name{{/i}}
        
       
        {{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}
        
 
        -- 
cgit v1.2.3


From 4d1f1f0fc7117b9edae1c1b1c0c2c899ffcd72e3 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 20:07:25 -0800
Subject: add typography pattern .page-header to components per #1701

---
 docs/assets/bootstrap.zip                | Bin 53056 -> 53056 bytes
 docs/components.html                     |  25 +++++++++++++++++++------
 docs/templates/pages/components.mustache |  25 +++++++++++++++++++------
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d9c4b4c60..402c12594 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index ac87f74b5..d0b5de632 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -98,7 +98,7 @@
         
       
       
      • Labels
        • 
-      
      • Hero
        • 
+      
      • Typography
        • 
       
      • Thumbnails
        • 
       
      • Alerts
        • 
       
      • Progress bars
        • 
@@ -1142,15 +1142,15 @@
 
 
 
-
-
        
+
        
   
        
-    
        Hero unit Jumbotron for your site's tagline
        
+    
        Typographic components Page header and hero unit for segmenting content
        
   
        
+  
        Hero unit
        
   
        
     
        
-      
        About
        
       
        Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.
        
       
        Markup
        
       
        Wrap your content in a div like so:
        
@@ -1173,7 +1173,20 @@
         
        Learn more
        
       
        
     
        
-  
        
+  
        
+  
        Page header
        
+  
        
+    
        
+      
        A simple shell for an h1 to appropratiely space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).
        
+    
        
+    
        
+
        +<div class="page-haeder">
+  <h1>Example page header</h1>
+</div>
+
        
+    
        
+  
        
 
 
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index ec7ba2636..0b55e60f0 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -22,7 +22,7 @@
         
       
       
      • {{_i}}Labels{{/i}}
        • 
-      
      • {{_i}}Hero{{/i}}
        • 
+      
      • {{_i}}Typography{{/i}}
        • 
       
      • {{_i}}Thumbnails{{/i}}
        • 
       
      • {{_i}}Alerts{{/i}}
        • 
       
      • {{_i}}Progress bars{{/i}}
        • 
@@ -1066,15 +1066,15 @@
 
 
 
-
-
        
+
        
   
        
-    
        {{_i}}Hero unit{{/i}} {{_i}}Jumbotron for your site's tagline{{/i}}
        
+    
        {{_i}}Typographic components{{/i}} {{_i}}Page header and hero unit for segmenting content{{/i}}
        
   
        
+  
        {{_i}}Hero unit{{/i}}
        
   
        
     
        
-      
        {{_i}}About{{/i}}
        
       
        {{_i}}Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.{{/i}}
        
       
        {{_i}}Markup{{/i}}
        
       
        {{_i}}Wrap your content in a div like so:{{/i}}
        
@@ -1097,7 +1097,20 @@
         
        {{_i}}Learn more{{/i}}
        
       
        
     
        
-
        +
        +

        {{_i}}Page header{{/i}}

        +
        +
        +

        {{_i}}A simple shell for an h1 to appropratiely space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).{{/i}}

        +
        +
        +
        +<div class="page-haeder">
+  <h1>{{_i}}Example page header{{/i}}</h1>
+</div>
+
        +
        +
        -- cgit v1.2.3 From be6fdd9a62a41bf4316dbe4c139787a568ac5bb7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 20:10:48 -0800 Subject: add docs for alt form control sizing per #1700 --- docs/assets/bootstrap.zip | Bin 53056 -> 53056 bytes docs/base-css.html | 11 ++++++++++- docs/templates/pages/base-css.mustache | 11 ++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 402c12594..15db21f3c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index 292e4a396..d67d1bd55 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1121,7 +1121,7 @@ For example, <code>section</code> should be wrapped as inline.
        Extending form controls
        - +
        @@ -1150,6 +1150,15 @@ For example, <code>section</code> should be wrapped as inline.

        Use the same .span* classes from the grid system for input sizes.

        +
        + +
        + + + +

        You may also use static classes that don't map to the grid, adapt to the responsive CSS styles, or account for varying types of controls (e.g., input vs. select).

        +
        +
        diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index cb79496a8..4b2f379c5 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1045,7 +1045,7 @@
        {{_i}}Extending form controls{{/i}}
        - +
        @@ -1074,6 +1074,15 @@

        {{_i}}Use the same .span* classes from the grid system for input sizes.{{/i}}

        +
        + +
        + + + +

        {{_i}}You may also use static classes that don't map to the grid, adapt to the responsive CSS styles, or account for varying types of controls (e.g., input vs. select).{{/i}}

        +
        +
        -- cgit v1.2.3 From 3e00c1261fa3d48b184874c9f5b94ce370bd6449 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 20:28:22 -0800 Subject: allow .input-prepend/.input-append to work in .navbar per #1681 --- docs/assets/bootstrap.zip | Bin 53056 -> 53129 bytes docs/assets/css/bootstrap.css | 7 +++++++ less/navbar.less | 10 +++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 15db21f3c..62f900de9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 61e67360c..38b1719de 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2530,6 +2530,13 @@ button.btn.small, input[type="submit"].btn.small { .navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { margin-top: 3px; } +.navbar-form .input-append, .navbar-form .input-prepend { + margin-top: 6px; + white-space: nowrap; +} +.navbar-form .input-append input, .navbar-form .input-prepend input { + margin-top: 0; +} .navbar-search { position: relative; float: left; diff --git a/less/navbar.less b/less/navbar.less index 35c209fc4..16553c1ff 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -81,7 +81,7 @@ margin-top: 5px; // make buttons vertically centered in navbar } .btn-group .btn { - margin-top: 0; + margin-top: 0; // then undo the margin here so we don't accidentally double it } } @@ -104,6 +104,14 @@ input[type="radio"] { margin-top: 3px; } + .input-append, + .input-prepend { + margin-top: 6px; + white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left + input { + margin-top: 0; // remove the margin on top since it's on the parent + } + } } // Navbar search -- cgit v1.2.3 From 944c7298d345dd46142a8338c59777827bdbde0c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 20:46:39 -0800 Subject: adding makeRow and makeColumn mixins for generating more semantic layouts --- docs/assets/bootstrap.zip | Bin 53129 -> 53129 bytes less/mixins.less | 13 +++++++++++++ 2 files changed, 13 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 62f900de9..0bc794af3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/less/mixins.less b/less/mixins.less index c2fc2c745..93bb229b5 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -270,6 +270,19 @@ } } +// Make a Grid +// ------------------------- +// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior +.makeRow() { + margin-left: @gridGutterWidth * -1; + .clearfix(); +} +.makeColumn(@columns: 1) { + float: left; + margin-left: @gridGutterWidth; + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); +} + // Form field states (used in forms.less) -- cgit v1.2.3 From cbe10bd591412c5bff365c86451caacb7cedb4f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 21:11:56 -0800 Subject: clean up nav-header in responsive --- docs/assets/bootstrap.zip | Bin 53129 -> 53155 bytes docs/assets/css/bootstrap-responsive.css | 4 ++++ less/responsive.less | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 0bc794af3..74c406578 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index de454224e..d01791cc5 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -314,6 +314,10 @@ .navbar .nav > .divider-vertical { display: none; } + .navbar .nav .nav-header { + color: #999999; + text-shadow: none; + } .navbar .nav > li > a, .navbar .dropdown-menu a { padding: 6px 15px; font-weight: bold; diff --git a/less/responsive.less b/less/responsive.less index 1e3bf371c..c55af0236 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -215,6 +215,10 @@ .navbar .nav > .divider-vertical { display: none; } + .navbar .nav .nav-header { + color: @navbarText; + text-shadow: none; + } // Nav and dropdown links in navbar .navbar .nav > li > a, .navbar .dropdown-menu a { -- cgit v1.2.3 From ce5976fb2901ec43c132fa7d517b9e2ca6041087 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 22:49:06 -0800 Subject: ensure help-block is block per #1937 --- docs/assets/bootstrap.zip | Bin 53155 -> 53155 bytes docs/assets/css/bootstrap.css | 1 + less/forms.less | 1 + 3 files changed, 2 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 74c406578..8a96db55c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 38b1719de..e52d2f0cf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -832,6 +832,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec color: #999999; } .help-block { + display: block; margin-top: 5px; margin-bottom: 0; color: #999999; diff --git a/less/forms.less b/less/forms.less index eb98f1bcb..81e5bb42c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -327,6 +327,7 @@ select:focus:required:invalid { // --------- .help-block { + display: block; // account for any element using help-block margin-top: 5px; margin-bottom: 0; color: @grayLight; -- cgit v1.2.3 From da948508447de169ab05c10a5f0a64bcb6a8aeb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 22:50:21 -0800 Subject: fix filename mention in js docs per #1938 --- docs/assets/bootstrap.zip | Bin 53155 -> 53155 bytes docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8a96db55c..b38db2772 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index f5563ac53..4ab4f5af3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -930,7 +930,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

        -

        Using bootstrap-alerts.js

        +

        Using bootstrap-alert.js

        Enable dismissal of an alert via javascript:

        $(".alert").alert()

        Markup

        diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 553913d21..c072e306b 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -854,7 +854,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

        -

        {{_i}}Using bootstrap-alerts.js{{/i}}

        +

        {{_i}}Using bootstrap-alert.js{{/i}}

        {{_i}}Enable dismissal of an alert via javascript:{{/i}}

        $(".alert").alert()

        {{_i}}Markup{{/i}}

        -- cgit v1.2.3 From 64ea59234f30f51ab5497830d1825c7e043a575e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Feb 2012 08:18:19 -0800 Subject: change up fonts on form elements to remove unnecessary font-family on label element, per #1950 --- docs/assets/bootstrap.zip | Bin 53155 -> 53163 bytes docs/assets/css/bootstrap.css | 7 ++++++- less/forms.less | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b38db2772..464f1d0d0 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e52d2f0cf..57c30ab63 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -530,11 +530,16 @@ input, button, select, textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 18px; } +input, +button, +select, +textarea { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +} label { display: block; margin-bottom: 5px; diff --git a/less/forms.less b/less/forms.less index 81e5bb42c..be9dbfaa9 100644 --- a/less/forms.less +++ b/less/forms.less @@ -42,7 +42,13 @@ input, button, select, textarea { - #font > .sans-serif(@baseFontSize,normal,@baseLineHeight); + #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here +} +input, +button, +select, +textarea { + #font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element) } // Identify controls by their labels -- cgit v1.2.3 From 6e77c9d1233c1621deeaa2dd00e6eca3fd618610 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 13 Feb 2012 18:41:02 -0800 Subject: add semicolons to the end of js files --- docs/assets/bootstrap.zip | Bin 52712 -> 52709 bytes docs/assets/js/bootstrap-alert.js | 2 +- docs/assets/js/bootstrap-button.js | 2 +- docs/assets/js/bootstrap-carousel.js | 2 +- docs/assets/js/bootstrap-collapse.js | 2 +- docs/assets/js/bootstrap-dropdown.js | 2 +- docs/assets/js/bootstrap-modal.js | 2 +- docs/assets/js/bootstrap-popover.js | 2 +- docs/assets/js/bootstrap-scrollspy.js | 2 +- docs/assets/js/bootstrap-tab.js | 2 +- docs/assets/js/bootstrap-tooltip.js | 2 +- docs/assets/js/bootstrap-transition.js | 4 ++-- docs/assets/js/bootstrap-typeahead.js | 2 +- js/bootstrap-alert.js | 2 +- js/bootstrap-button.js | 2 +- js/bootstrap-carousel.js | 2 +- js/bootstrap-collapse.js | 2 +- js/bootstrap-dropdown.js | 2 +- js/bootstrap-modal.js | 2 +- js/bootstrap-popover.js | 2 +- js/bootstrap-scrollspy.js | 2 +- js/bootstrap-tab.js | 2 +- js/bootstrap-tooltip.js | 2 +- js/bootstrap-transition.js | 4 ++-- js/bootstrap-typeahead.js | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 073df93f0..ca2768c6e 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 4a65b135a..56d89c298 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -88,4 +88,4 @@ $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index a3f4657e8..89101ed7b 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -95,4 +95,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 2f47edb8d..3c0f1df83 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -151,4 +151,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 8134cc42f..53bcd7c40 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -133,4 +133,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index 48d3ce0f8..ce65aa3b5 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -89,4 +89,4 @@ $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index ffbed0d2e..0a69b6a2f 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -207,4 +207,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index 35ff9d0ab..4df81fee9 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -92,4 +92,4 @@ , template: '

        ' }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index e8bd0715c..f9aba137b 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -122,4 +122,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js index f19db5da1..78258c6a0 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -127,4 +127,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 21f2311fb..e1c8b2dc2 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -267,4 +267,4 @@ , template: '
        ' } -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 956350bd0..0b13eccd4 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -47,5 +47,5 @@ })() }) - -}( window.jQuery ) + +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index 1426185af..e0be49fec 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -268,4 +268,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 4a65b135a..56d89c298 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -88,4 +88,4 @@ $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index a3f4657e8..89101ed7b 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -95,4 +95,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 2f47edb8d..3c0f1df83 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -151,4 +151,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 8134cc42f..53bcd7c40 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -133,4 +133,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 48d3ce0f8..ce65aa3b5 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -89,4 +89,4 @@ $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index ffbed0d2e..0a69b6a2f 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -207,4 +207,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 35ff9d0ab..4df81fee9 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -92,4 +92,4 @@ , template: '

        ' }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index e8bd0715c..f9aba137b 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -122,4 +122,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index f19db5da1..78258c6a0 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -127,4 +127,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 21f2311fb..e1c8b2dc2 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -267,4 +267,4 @@ , template: '
        ' } -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 956350bd0..0b13eccd4 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -47,5 +47,5 @@ })() }) - -}( window.jQuery ) + +}( window.jQuery ); \ No newline at end of file diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 1426185af..e0be49fec 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -268,4 +268,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file -- cgit v1.2.3 From 792059b7adf65843a7befdd0d6a5b3b57aeb6d61 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:04:26 -0800 Subject: fix alerts --- js/bootstrap-alert.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 56d89c298..1d69c5f53 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -51,11 +51,14 @@ $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent.removeClass('in') + $parent + .trigger('close') + .removeClass('in') function removeElement() { - $parent.remove() - $parent.trigger('closed') + $parent + .trigger('closed') + .remove() } $.support.transition && $parent.hasClass('fade') ? -- cgit v1.2.3 From f9b578260f8898748a2de10bc0bec74699ec5c10 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:05:09 -0800 Subject: rebuild alerts --- docs/assets/bootstrap.zip | Bin 53160 -> 53167 bytes docs/assets/js/bootstrap-alert.js | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 2041e410b..e433b7305 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 56d89c298..1d69c5f53 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -51,11 +51,14 @@ $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent.removeClass('in') + $parent + .trigger('close') + .removeClass('in') function removeElement() { - $parent.remove() - $parent.trigger('closed') + $parent + .trigger('closed') + .remove() } $.support.transition && $parent.hasClass('fade') ? -- cgit v1.2.3 From e730f8adb562ccb885d48fea6f8f075530ef53d8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:22:01 -0800 Subject: null out interval so that pause doesn't resume on next or prev --- docs/assets/bootstrap.zip | Bin 53167 -> 53181 bytes docs/assets/js/bootstrap-carousel.js | 1 + js/bootstrap-carousel.js | 1 + 3 files changed, 2 insertions(+) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e433b7305..dacefe63f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 3c0f1df83..374697994 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -61,6 +61,7 @@ , pause: function () { clearInterval(this.interval) + this.interval = null return this } diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 3c0f1df83..374697994 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -61,6 +61,7 @@ , pause: function () { clearInterval(this.interval) + this.interval = null return this } -- cgit v1.2.3 From 6da16a6def486413b1897540aff1f335638ed5e6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:30:00 -0800 Subject: fix dropdown links --- docs/templates/pages/components.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 0b55e60f0..76c78d141 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -767,14 +767,14 @@ <div class="navbar"> <div class="navbar-inner"> <div class="container"> - + <!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} --> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </a> - + <!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} --> <a class="brand" href="#">{{_i}}Project name{{/i}}</a> @@ -807,7 +807,7 @@

        {{_i}}Component alignment{{/i}}

        {{_i}}To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

        {{_i}}Adding dropdowns{{/i}}

        -

        {{_i}}Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.{{/i}}

        +

        {{_i}}Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.{{/i}}

         <ul class="nav">
   <li class="dropdown">
@@ -823,7 +823,7 @@
   </li>
 </ul>
        -

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

        +

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

        -- cgit v1.2.3 From 1520ec446ce9fc748efa3390a58c447841c48e73 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:30:18 -0800 Subject: rebuild bro --- docs/assets/bootstrap.zip | Bin 53181 -> 53181 bytes docs/components.html | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index dacefe63f..e282ec6fd 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index d0b5de632..af00ece97 100644 --- a/docs/components.html +++ b/docs/components.html @@ -843,14 +843,14 @@ <div class="navbar"> <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="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </a> - + <!-- Be sure to leave the brand out there if you want it shown --> <a class="brand" href="#">Project name</a> @@ -883,7 +883,7 @@

        Component alignment

        To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.

        Adding dropdowns

        -

        Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.

        +

        Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.

         <ul class="nav">
   <li class="dropdown">
@@ -899,7 +899,7 @@
   </li>
 </ul>
        -

        Get the javascript →

        +

        Get the javascript →

        -- cgit v1.2.3 From b3e4e5ae2212c4bda6424815871499d9c7693ee6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:33:15 -0800 Subject: add idea to modal markup exmaple --- docs/assets/bootstrap.zip | Bin 53181 -> 53181 bytes docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e282ec6fd..a68034b6a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 4ab4f5af3..612724c79 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -289,7 +289,7 @@ 
        -<div class="modal">
+<div class="modal" id="myModal">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3>Modal header</h3>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c072e306b..ac989f3ed 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -213,7 +213,7 @@
 
        -<div class="modal">
+<div class="modal" id="myModal">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3>Modal header</h3>
-- 
cgit v1.2.3


From 9d12b2d60168505fdb68672f6fe7992bb264da90 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 16 Feb 2012 20:43:57 -0800
Subject: don't try next if not next

---
 docs/assets/bootstrap.zip            | Bin 53181 -> 53191 bytes
 docs/assets/js/bootstrap-carousel.js |   2 ++
 js/bootstrap-carousel.js             |   2 ++
 3 files changed, 4 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a68034b6a..0aad46dec 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index 374697994..bad4f46f4 100644
--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -83,6 +83,8 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
+      if (!$next.length) return
+
       this.sliding = true
 
       isCycling && this.pause()
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 374697994..bad4f46f4 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -83,6 +83,8 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
+      if (!$next.length) return
+
       this.sliding = true
 
       isCycling && this.pause()
-- 
cgit v1.2.3


From c3d3cf7262ff53215f11ec4772c9c787643b33e2 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 16 Feb 2012 20:46:35 -0800
Subject: add note about popover placement

---
 docs/templates/pages/upgrading.mustache | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index ebe70bcdd..5a82e2dc9 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -39,7 +39,7 @@
   
          
     
        • {{_i}}Media queries added for basic support across mobile and tablet devices{{/i}}
     
        • {{_i}}Responsive CSS is compiled separately, as bootstrap-responsive.css{{/i}}
          • 
-  
          
+  
 
 
 
@@ -179,13 +179,10 @@
     
      • {{_i}}The animate option was renamed to animation.{{/i}}
        • 
     
      • {{_i}}The html option was removed, as the tooltips default to allowing HTML now.{{/i}}
        • 
   
-  
        {{_i}}Tooltips{{/i}}
        
-  
          
-    
        • {{_i}}Values for placement option changed from above and below to top and bottom. (Affects popovers, too.){{/i}}
          • 
-  
        
   
        {{_i}}Popovers{{/i}}
        
   
          
     
        • {{_i}}Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.{{/i}}
          • 
+    
        • {{_i}}The placement option value that was below is now bottom, and above is now top.{{/i}}
          • 
   
        
   
        {{_i}}New plugins{{/i}}
        
   
          
-- 
cgit v1.2.3


From 0369c1fcfc22530171fdf6a1d6400767dc13f609 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 16 Feb 2012 21:04:16 -0800
Subject: add mention of navbar vertical divider in docs

---
 docs/assets/bootstrap.zip                | Bin 53191 -> 53191 bytes
 docs/components.html                     |   8 ++++++++
 docs/templates/pages/components.mustache |   8 ++++++++
 docs/upgrading.html                      |   7 ++-----
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0aad46dec..7aee4471a 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index af00ece97..cf11e6998 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -879,6 +879,14 @@
   <li><a href="#">Link</a></li>
   <li><a href="#">Link</a></li>
 </ul>
+
        +

        You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:

        +
        +<ul class="nav">
+  ...
+  <li class="divider-vertical"></li>
+  ...
+</ul>

        Component alignment

        To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.

        diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 76c78d141..1887b6f77 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -803,6 +803,14 @@ <li><a href="#">{{_i}}Link{{/i}}</a></li> <li><a href="#">{{_i}}Link{{/i}}</a></li> </ul> + +

        {{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}

        +
        +<ul class="nav">
+  ...
+  <li class="divider-vertical"></li>
+  ...
+</ul>

        {{_i}}Component alignment{{/i}}

        {{_i}}To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

        diff --git a/docs/upgrading.html b/docs/upgrading.html index 0c9ab1673..f56f22545 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -115,7 +115,7 @@
        • Media queries added for basic support across mobile and tablet devices
        • Responsive CSS is compiled separately, as bootstrap-responsive.css
          • -
        + @@ -255,13 +255,10 @@
      • The animate option was renamed to animation.
      • The html option was removed, as the tooltips default to allowing HTML now.
        • -

        Tooltips

        -
          -
        • Values for placement option changed from above and below to top and bottom. (Affects popovers, too.)
          • -

        Popovers

        • Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.
          • +
        • The placement option value that was below is now bottom, and above is now top.

        New plugins

          -- cgit v1.2.3 From 489276f5be328773e4e4dbd7d6d8e326d3135437 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:08:52 -0800 Subject: fix responsive media queries to use 979 and 980 where appropro --- docs/assets/bootstrap.zip | Bin 53191 -> 53195 bytes docs/assets/css/bootstrap-responsive.css | 4 ++-- docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- less/responsive.less | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7aee4471a..644dd58f7 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index d01791cc5..a4277a26f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -102,7 +102,7 @@ margin: 0; } } -@media (min-width: 768px) and (max-width: 980px) { +@media (min-width: 768px) and (max-width: 979px) { .row { margin-left: -20px; *zoom: 1; @@ -278,7 +278,7 @@ width: 714px; } } -@media (max-width: 980px) { +@media (max-width: 979px) { body { padding-top: 0; } diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 18ec5fb42..525c1152f 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -444,7 +444,7 @@
        - + diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index cc3cceea7..50c776e2d 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -368,7 +368,7 @@ - + diff --git a/less/responsive.less b/less/responsive.less index c55af0236..5b85776e9 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -154,7 +154,7 @@ // PORTRAIT TABLET TO DEFAULT DESKTOP // ---------------------------------- -@media (min-width: 768px) and (max-width: 980px) { +@media (min-width: 768px) and (max-width: 979px) { // Fixed grid #gridSystem > .generate(12, 42px, 20px); @@ -171,7 +171,7 @@ // TABLETS AND BELOW // ----------------- -@media (max-width: 980px) { +@media (max-width: 979px) { // UNFIX THE TOPBAR // ---------------- -- cgit v1.2.3 From 61e2201c64a9a61792680c2b1d236b0a753ed182 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:25:40 -0800 Subject: fix buttons focus state and swap a buttons for button buttons --- docs/assets/bootstrap.zip | Bin 53195 -> 53198 bytes docs/assets/css/bootstrap.css | 6 +++--- docs/base-css.html | 14 +++++++------- docs/templates/pages/base-css.mustache | 14 +++++++------- less/mixins.less | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 644dd58f7..71552e7f8 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 57c30ab63..e16383b1c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -33,7 +33,7 @@ html { -ms-text-size-adjust: 100%; } a:focus { - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -675,7 +675,7 @@ select:focus { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1749,7 +1749,7 @@ table .span12 { transition: background-position 0.1s linear; } .btn:focus { - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } diff --git a/docs/base-css.html b/docs/base-css.html index d67d1bd55..7ab18108c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1266,37 +1266,37 @@ For example, <code>section</code> should be wrapped as inline. - + - + - + - + - + - + - + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 4b2f379c5..f3d18ffd0 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1190,37 +1190,37 @@ - + - + - + - + - + - + - + diff --git a/less/mixins.less b/less/mixins.less index 93bb229b5..96af8219d 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -25,7 +25,7 @@ // ------------------ .tab-focus() { // Default - outline: thin dotted; + outline: thin dotted #333; // Webkit outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; -- cgit v1.2.3 From 268e7d67abb32ed5cfc575c71f03d635672e781c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:28:16 -0800 Subject: add mini buttons per #1971 --- docs/assets/bootstrap.zip | Bin 53198 -> 53227 bytes docs/assets/css/bootstrap.css | 5 +++++ docs/base-css.html | 6 +++++- docs/templates/pages/base-css.mustache | 6 +++++- less/buttons.less | 7 +++++++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 71552e7f8..5d59b6d7f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e16383b1c..d6441d133 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1791,6 +1791,11 @@ table .span12 { .btn-small [class^="icon-"] { margin-top: -1px; } +.btn-mini { + padding: 2px 6px; + font-size: 11px; + line-height: 14px; +} .btn-primary, .btn-primary:hover, .btn-warning, diff --git a/docs/base-css.html b/docs/base-css.html index 7ab18108c..c04dc7daa 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1313,7 +1313,7 @@ For example, <code>section</code> should be wrapped as inline.

        Multiple sizes

        -

        Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.

        +

        Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.

        @@ -1322,6 +1322,10 @@ For example, <code>section</code> should be wrapped as inline.

        +

        + + +


        Disabled state

        For disabled buttons, add the .disabled class to links and the disabled attribute for <button> elements.

        diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index f3d18ffd0..acb9cdcb2 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1237,7 +1237,7 @@

        {{_i}}Multiple sizes{{/i}}

        -

        {{_i}}Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.{{/i}}

        +

        {{_i}}Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.{{/i}}

        @@ -1246,6 +1246,10 @@

        +

        + + +


        {{_i}}Disabled state{{/i}}

        {{_i}}For disabled buttons, add the .disabled class to links and the disabled attribute for <button> elements.{{/i}}

        diff --git a/less/buttons.less b/less/buttons.less index 292e04626..55e9fbf1c 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -92,6 +92,13 @@ margin-top: -1px; } +// Mini +.btn-mini { + padding: 2px 6px; + font-size: @baseFontSize - 2px; + line-height: @baseLineHeight - 4px; +} + // Alternate buttons // -------------------------------------------------- -- cgit v1.2.3 From 6f6adfb52fc2f6043f84ac4fab876592c00b2894 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 22:04:11 -0800 Subject: change clearfix mixin to drop parens that prevent it from being a class, too --- docs/assets/bootstrap.zip | Bin 53227 -> 53322 bytes docs/assets/css/bootstrap-responsive.css | 10 ++++++++++ docs/assets/css/bootstrap.css | 10 ++++++++++ less/mixins.less | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 5d59b6d7f..4ef9191d6 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index a4277a26f..780719e65 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -7,6 +7,16 @@ * * Designed and built with all the love in the world @twitter by @mdo and @fat. */ +.clearfix { + *zoom: 1; +} +.clearfix:before, .clearfix:after { + display: table; + content: ""; +} +.clearfix:after { + clear: both; +} .hidden { display: none; visibility: hidden; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d6441d133..74d7308be 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -94,6 +94,16 @@ textarea { overflow: auto; vertical-align: top; } +.clearfix { + *zoom: 1; +} +.clearfix:before, .clearfix:after { + display: table; + content: ""; +} +.clearfix:after { + clear: both; +} body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/less/mixins.less b/less/mixins.less index 96af8219d..3cf1a3704 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -9,7 +9,7 @@ // Clearfix // -------- // For clearing floats like a boss h5bp.com/q -.clearfix() { +.clearfix { *zoom: 1; &:before, &:after { -- cgit v1.2.3 From 091622644a0c619e1afbb21041c141da30df76b7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 22:34:30 -0800 Subject: bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE --- docs/assets/bootstrap.zip | Bin 53322 -> 53357 bytes docs/assets/css/bootstrap.css | 8 +++++++- less/code.less | 1 + less/forms.less | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4ef9191d6..622ad0117 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74d7308be..ed32b339f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -498,6 +498,7 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + word-wrap: break-word; } pre.prettyprint { margin-bottom: 18px; @@ -588,11 +589,16 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { /* IE7 */ line-height: normal; - border: 0; cursor: pointer; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + border: 0 \9; + /* IE9 and down */ + +} +input[type="image"] { + border: 0; } input[type="file"] { width: auto; diff --git a/less/code.less b/less/code.less index 35a8ae6b8..e2157d8ab 100644 --- a/less/code.less +++ b/less/code.less @@ -34,6 +34,7 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + word-wrap: break-word; // Make prettyprint styles more spaced out for readability &.prettyprint { diff --git a/less/forms.less b/less/forms.less index be9dbfaa9..0a5fa2b86 100644 --- a/less/forms.less +++ b/less/forms.less @@ -96,9 +96,12 @@ input[type="radio"] { margin: 3px 0; *margin-top: 0; /* IE7 */ line-height: normal; - border: 0; cursor: pointer; .border-radius(0); + border: 0 \9; /* IE9 and down */ +} +input[type="image"] { + border: 0; } // Reset the file input to browser defaults -- cgit v1.2.3
        Landscape tablets768px to 980px768px to 979px 42px 20px
        {{_i}}Landscape tablets{{/i}}768px to 980px768px to 979px 42px 20px
        Default .btn Standard gray button with gradient
        Primary .btn-primary Provides extra visual weight and identifies the primary action in a set of buttons
        Info .btn-info Used as an alternate to the default styles
        Success .btn-success Indicates a successful or positive action
        Warning .btn-warning Indicates caution should be taken with this action
        Danger .btn-danger Indicates a dangerous or potentially negative action
        Inverse .btn-inverse Alternate dark gray button, not tied to a semantic action or use
        {{_i}}Default{{/i}} .btn {{_i}}Standard gray button with gradient{{/i}}
        {{_i}}Primary{{/i}} .btn-primary {{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}
        {{_i}}Info{{/i}} .btn-info {{_i}}Used as an alternate to the default styles{{/i}}
        {{_i}}Success{{/i}} .btn-success {{_i}}Indicates a successful or positive action{{/i}}
        {{_i}}Warning{{/i}} .btn-warning {{_i}}Indicates caution should be taken with this action{{/i}}
        {{_i}}Danger{{/i}} .btn-danger {{_i}}Indicates a dangerous or potentially negative action{{/i}}
        {{_i}}Inverse{{/i}} .btn-inverse {{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}