From 86a577d76bd1dcd226dad90899886dbe18d36e39 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 1 Aug 2012 20:34:19 -0700
Subject: [PATCH 1/5] decrease box-shadow

---
 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 aa7f080959..7ddfeb1acc 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -134,7 +134,7 @@ hr.soften {
 /* Download button */
 @-webkit-keyframes downloadButton {
   from { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.1); }
-  50% {  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 50px rgba(0,68,204,1); }
+  50% {  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 25px rgba(0,68,204,.9); }
   to {   -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.1); }
 }
 .masthead .btn {

From fc7ecd78c88771ca9b899f19d56f84970fe9429b Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 1 Aug 2012 20:58:33 -0700
Subject: [PATCH 2/5] add select element responsive CSS test

---
 less/tests/css-tests.html | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 8d9785187f..d7bca7b0f0 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -818,6 +818,30 @@
 <br>
 
 
+<h4>Fluid textarea at .span12</h4>
+<div class="row-fluid">
+  <div class="span12">
+    <textarea class="span12"></textarea>
+  </div>
+</div>
+
+
+<br>
+
+
+<h4>Selects</h4>
+<form>
+  <select class="span4">
+    <option>Option</option>
+  </select>
+</form>
+
+
+<br>
+
+
+
+
 <!-- Dropdowns
 ================================================== -->
 
@@ -1098,19 +1122,6 @@
 
 
 
-<br>
-<br>
-<br>
-
-
-      <h4>Fluid textarea at .span12</h4>
-      <div class="row-fluid">
-        <div class="span12">
-          <textarea class="span12"></textarea>
-        </div>
-      </div>
-
-
     </div><!-- /container -->
 
 

From 1e2edaef48e45c1a085cd21ad2cbf86cfe2c7c06 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 1 Aug 2012 22:52:53 -0700
Subject: [PATCH 3/5] add test for #4236: button group, one button with text
 and one with icon, now line up properly

---
 less/tests/css-tests.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index d7bca7b0f0..6786454cc7 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -1033,6 +1033,7 @@
   </div>
 </div> <!-- /tabbable -->
 
+<br>
 
 
 <!-- Labels
@@ -1059,13 +1060,14 @@
   </div><!--/span-->
 </div><!--/row-->
 
+<br>
 
 
 <!-- Button groups
 ================================================== -->
 
 <div class="page-header">
-  <h1>Button groups</h1>
+  <h1>Buttons</h1>
 </div>
 
 <table class="table table-bordered">
@@ -1086,6 +1088,14 @@
   </tbody>
 </table>
 
+<h4>Mini buttons: text and icon</h4>
+<div class="btn-group">
+  <button class="btn btn-mini">Button text</button>
+  <button class="btn btn-mini"><i class="icon-cog"></i></button>
+</div>
+
+<br>
+
 
 
 <!-- Responsive utility classes

From 148203067978a13aeadd2127b0ddf00299cb8e98 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 1 Aug 2012 23:15:51 -0700
Subject: [PATCH 4/5] fixes #4207: redeclare box-shadow on .formFieldState()
 mixin so transitions work in WebKit

---
 docs/assets/css/bootstrap.css | 117 +++++++++++++++++++++++++++++-----
 less/mixins.less              |  21 +++++-
 2 files changed, 121 insertions(+), 17 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index bcbe4d9dac..b9d34e8e96 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1300,22 +1300,51 @@ input[type="checkbox"][readonly] {
 
 .control-group.warning .checkbox,
 .control-group.warning .radio,
-.control-group.warning input,
+.control-group.warning input[type="text"],
+.control-group.warning input[type="password"],
+.control-group.warning input[type="datetime"],
+.control-group.warning input[type="datetime-local"],
+.control-group.warning input[type="date"],
+.control-group.warning input[type="month"],
+.control-group.warning input[type="time"],
+.control-group.warning input[type="week"],
+.control-group.warning input[type="number"],
+.control-group.warning input[type="email"],
+.control-group.warning input[type="url"],
+.control-group.warning input[type="search"],
+.control-group.warning input[type="tel"],
+.control-group.warning input[type="color"],
 .control-group.warning select,
 .control-group.warning textarea {
   color: #c09853;
   border-color: #c09853;
+  -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);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 
 .control-group.warning .checkbox:focus,
 .control-group.warning .radio:focus,
-.control-group.warning input:focus,
+.control-group.warning input[type="text"]:focus,
+.control-group.warning input[type="password"]:focus,
+.control-group.warning input[type="datetime"]:focus,
+.control-group.warning input[type="datetime-local"]:focus,
+.control-group.warning input[type="date"]:focus,
+.control-group.warning input[type="month"]:focus,
+.control-group.warning input[type="time"]:focus,
+.control-group.warning input[type="week"]:focus,
+.control-group.warning input[type="number"]:focus,
+.control-group.warning input[type="email"]:focus,
+.control-group.warning input[type="url"]:focus,
+.control-group.warning input[type="search"]:focus,
+.control-group.warning input[type="tel"]:focus,
+.control-group.warning input[type="color"]:focus,
 .control-group.warning select:focus,
 .control-group.warning textarea:focus {
   border-color: #a47e3c;
-  -webkit-box-shadow: 0 0 6px #dbc59e;
-     -moz-box-shadow: 0 0 6px #dbc59e;
-          box-shadow: 0 0 6px #dbc59e;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
 }
 
 .control-group.warning .input-prepend .add-on,
@@ -1333,22 +1362,51 @@ input[type="checkbox"][readonly] {
 
 .control-group.error .checkbox,
 .control-group.error .radio,
-.control-group.error input,
+.control-group.error input[type="text"],
+.control-group.error input[type="password"],
+.control-group.error input[type="datetime"],
+.control-group.error input[type="datetime-local"],
+.control-group.error input[type="date"],
+.control-group.error input[type="month"],
+.control-group.error input[type="time"],
+.control-group.error input[type="week"],
+.control-group.error input[type="number"],
+.control-group.error input[type="email"],
+.control-group.error input[type="url"],
+.control-group.error input[type="search"],
+.control-group.error input[type="tel"],
+.control-group.error input[type="color"],
 .control-group.error select,
 .control-group.error textarea {
   color: #b94a48;
   border-color: #b94a48;
+  -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);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 
 .control-group.error .checkbox:focus,
 .control-group.error .radio:focus,
-.control-group.error input:focus,
+.control-group.error input[type="text"]:focus,
+.control-group.error input[type="password"]:focus,
+.control-group.error input[type="datetime"]:focus,
+.control-group.error input[type="datetime-local"]:focus,
+.control-group.error input[type="date"]:focus,
+.control-group.error input[type="month"]:focus,
+.control-group.error input[type="time"]:focus,
+.control-group.error input[type="week"]:focus,
+.control-group.error input[type="number"]:focus,
+.control-group.error input[type="email"]:focus,
+.control-group.error input[type="url"]:focus,
+.control-group.error input[type="search"]:focus,
+.control-group.error input[type="tel"]:focus,
+.control-group.error input[type="color"]:focus,
 .control-group.error select:focus,
 .control-group.error textarea:focus {
   border-color: #953b39;
-  -webkit-box-shadow: 0 0 6px #d59392;
-     -moz-box-shadow: 0 0 6px #d59392;
-          box-shadow: 0 0 6px #d59392;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
 }
 
 .control-group.error .input-prepend .add-on,
@@ -1366,22 +1424,51 @@ input[type="checkbox"][readonly] {
 
 .control-group.success .checkbox,
 .control-group.success .radio,
-.control-group.success input,
+.control-group.success input[type="text"],
+.control-group.success input[type="password"],
+.control-group.success input[type="datetime"],
+.control-group.success input[type="datetime-local"],
+.control-group.success input[type="date"],
+.control-group.success input[type="month"],
+.control-group.success input[type="time"],
+.control-group.success input[type="week"],
+.control-group.success input[type="number"],
+.control-group.success input[type="email"],
+.control-group.success input[type="url"],
+.control-group.success input[type="search"],
+.control-group.success input[type="tel"],
+.control-group.success input[type="color"],
 .control-group.success select,
 .control-group.success textarea {
   color: #468847;
   border-color: #468847;
+  -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);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 
 .control-group.success .checkbox:focus,
 .control-group.success .radio:focus,
-.control-group.success input:focus,
+.control-group.success input[type="text"]:focus,
+.control-group.success input[type="password"]:focus,
+.control-group.success input[type="datetime"]:focus,
+.control-group.success input[type="datetime-local"]:focus,
+.control-group.success input[type="date"]:focus,
+.control-group.success input[type="month"]:focus,
+.control-group.success input[type="time"]:focus,
+.control-group.success input[type="week"]:focus,
+.control-group.success input[type="number"]:focus,
+.control-group.success input[type="email"]:focus,
+.control-group.success input[type="url"]:focus,
+.control-group.success input[type="search"]:focus,
+.control-group.success input[type="tel"]:focus,
+.control-group.success input[type="color"]:focus,
 .control-group.success select:focus,
 .control-group.success textarea:focus {
   border-color: #356635;
-  -webkit-box-shadow: 0 0 6px #7aba7b;
-     -moz-box-shadow: 0 0 6px #7aba7b;
-          box-shadow: 0 0 6px #7aba7b;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
 }
 
 .control-group.success .input-prepend .add-on,
diff --git a/less/mixins.less b/less/mixins.less
index 96ce23ecab..c9b701cb66 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -170,14 +170,31 @@
   // Style inputs accordingly
   .checkbox,
   .radio,
-  input,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
   select,
   textarea {
     color: @textColor;
     border-color: @borderColor;
+    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
     &:focus {
       border-color: darken(@borderColor, 10%);
-      .box-shadow(0 0 6px lighten(@borderColor, 20%));
+      // Write out in full since the lighten() function isn't easily escaped
+      -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+         -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+              box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
     }
   }
   // Give a small background color for input-prepend/-append

From d27dcf3b070015aca81d86de00e1b2ea6e0f30ff Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 1 Aug 2012 23:16:49 -0700
Subject: [PATCH 5/5] cut down on selectors on .formFieldState() mixin to
 origin input catchall

---
 docs/assets/css/bootstrap.css | 90 +++--------------------------------
 less/mixins.less              | 15 +-----
 2 files changed, 7 insertions(+), 98 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b9d34e8e96..651e764bd6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1300,20 +1300,7 @@ input[type="checkbox"][readonly] {
 
 .control-group.warning .checkbox,
 .control-group.warning .radio,
-.control-group.warning input[type="text"],
-.control-group.warning input[type="password"],
-.control-group.warning input[type="datetime"],
-.control-group.warning input[type="datetime-local"],
-.control-group.warning input[type="date"],
-.control-group.warning input[type="month"],
-.control-group.warning input[type="time"],
-.control-group.warning input[type="week"],
-.control-group.warning input[type="number"],
-.control-group.warning input[type="email"],
-.control-group.warning input[type="url"],
-.control-group.warning input[type="search"],
-.control-group.warning input[type="tel"],
-.control-group.warning input[type="color"],
+.control-group.warning input,
 .control-group.warning select,
 .control-group.warning textarea {
   color: #c09853;
@@ -1325,20 +1312,7 @@ input[type="checkbox"][readonly] {
 
 .control-group.warning .checkbox:focus,
 .control-group.warning .radio:focus,
-.control-group.warning input[type="text"]:focus,
-.control-group.warning input[type="password"]:focus,
-.control-group.warning input[type="datetime"]:focus,
-.control-group.warning input[type="datetime-local"]:focus,
-.control-group.warning input[type="date"]:focus,
-.control-group.warning input[type="month"]:focus,
-.control-group.warning input[type="time"]:focus,
-.control-group.warning input[type="week"]:focus,
-.control-group.warning input[type="number"]:focus,
-.control-group.warning input[type="email"]:focus,
-.control-group.warning input[type="url"]:focus,
-.control-group.warning input[type="search"]:focus,
-.control-group.warning input[type="tel"]:focus,
-.control-group.warning input[type="color"]:focus,
+.control-group.warning input:focus,
 .control-group.warning select:focus,
 .control-group.warning textarea:focus {
   border-color: #a47e3c;
@@ -1362,20 +1336,7 @@ input[type="checkbox"][readonly] {
 
 .control-group.error .checkbox,
 .control-group.error .radio,
-.control-group.error input[type="text"],
-.control-group.error input[type="password"],
-.control-group.error input[type="datetime"],
-.control-group.error input[type="datetime-local"],
-.control-group.error input[type="date"],
-.control-group.error input[type="month"],
-.control-group.error input[type="time"],
-.control-group.error input[type="week"],
-.control-group.error input[type="number"],
-.control-group.error input[type="email"],
-.control-group.error input[type="url"],
-.control-group.error input[type="search"],
-.control-group.error input[type="tel"],
-.control-group.error input[type="color"],
+.control-group.error input,
 .control-group.error select,
 .control-group.error textarea {
   color: #b94a48;
@@ -1387,20 +1348,7 @@ input[type="checkbox"][readonly] {
 
 .control-group.error .checkbox:focus,
 .control-group.error .radio:focus,
-.control-group.error input[type="text"]:focus,
-.control-group.error input[type="password"]:focus,
-.control-group.error input[type="datetime"]:focus,
-.control-group.error input[type="datetime-local"]:focus,
-.control-group.error input[type="date"]:focus,
-.control-group.error input[type="month"]:focus,
-.control-group.error input[type="time"]:focus,
-.control-group.error input[type="week"]:focus,
-.control-group.error input[type="number"]:focus,
-.control-group.error input[type="email"]:focus,
-.control-group.error input[type="url"]:focus,
-.control-group.error input[type="search"]:focus,
-.control-group.error input[type="tel"]:focus,
-.control-group.error input[type="color"]:focus,
+.control-group.error input:focus,
 .control-group.error select:focus,
 .control-group.error textarea:focus {
   border-color: #953b39;
@@ -1424,20 +1372,7 @@ input[type="checkbox"][readonly] {
 
 .control-group.success .checkbox,
 .control-group.success .radio,
-.control-group.success input[type="text"],
-.control-group.success input[type="password"],
-.control-group.success input[type="datetime"],
-.control-group.success input[type="datetime-local"],
-.control-group.success input[type="date"],
-.control-group.success input[type="month"],
-.control-group.success input[type="time"],
-.control-group.success input[type="week"],
-.control-group.success input[type="number"],
-.control-group.success input[type="email"],
-.control-group.success input[type="url"],
-.control-group.success input[type="search"],
-.control-group.success input[type="tel"],
-.control-group.success input[type="color"],
+.control-group.success input,
 .control-group.success select,
 .control-group.success textarea {
   color: #468847;
@@ -1449,20 +1384,7 @@ input[type="checkbox"][readonly] {
 
 .control-group.success .checkbox:focus,
 .control-group.success .radio:focus,
-.control-group.success input[type="text"]:focus,
-.control-group.success input[type="password"]:focus,
-.control-group.success input[type="datetime"]:focus,
-.control-group.success input[type="datetime-local"]:focus,
-.control-group.success input[type="date"]:focus,
-.control-group.success input[type="month"]:focus,
-.control-group.success input[type="time"]:focus,
-.control-group.success input[type="week"]:focus,
-.control-group.success input[type="number"]:focus,
-.control-group.success input[type="email"]:focus,
-.control-group.success input[type="url"]:focus,
-.control-group.success input[type="search"]:focus,
-.control-group.success input[type="tel"]:focus,
-.control-group.success input[type="color"]:focus,
+.control-group.success input:focus,
 .control-group.success select:focus,
 .control-group.success textarea:focus {
   border-color: #356635;
diff --git a/less/mixins.less b/less/mixins.less
index c9b701cb66..1b2f0bcfb7 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -170,20 +170,7 @@
   // Style inputs accordingly
   .checkbox,
   .radio,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
+  input,
   select,
   textarea {
     color: @textColor;