Merge branch 'bartt-master' into 2.0.3-wip

Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less

4 files changed, 34 insertions, 33 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index d28e5bbad..81961123d 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -93,8 +93,9 @@
 .btn-group .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
+  .box-shadow(inset 1px 0 0 rgba(255,255,255,.125),
+              inset 0 1px 0 rgba(255,255,255,.2),
+              0 1px 2px rgba(0,0,0,.05));
   *padding-top: 3px;
   *padding-bottom: 3px;
 }
@@ -119,8 +120,8 @@
   // Remove the gradient and set the same inset shadow as the :active state
   .dropdown-toggle {
     background-image: none;
-    @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-    .box-shadow(@shadow);
+    .box-shadow(inset 0 2px 4px rgba(0,0,0,.15),
+                0 1px 2px rgba(0,0,0,.05));
   }
 
   // Keep the hover's background when dropdown is open
diff --git a/less/buttons.less b/less/buttons.less
index 83f9c737c..4381fe995 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -21,8 +21,8 @@
   border: 1px solid @btnBorder;
   border-bottom-color: darken(@btnBorder, 10%);
   .border-radius(4px);
-  @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
+  .box-shadow(inset 0 1px 0 rgba(255,255,255,.2),
+              0 1px 2px rgba(0,0,0,.05));
   cursor: pointer;
 
   // Give IE7 some love
@@ -50,8 +50,8 @@
 .btn.active,
 .btn:active {
   background-image: none;
-  @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
+  .box-shadow(inset 0 2px 4px rgba(0,0,0,.15),
+              0 1px 2px rgba(0,0,0,.05));
   background-color: darken(@white, 10%);
   background-color: darken(@white, 15%) e("\9");
   outline: 0;
diff --git a/less/forms.less b/less/forms.less
index af1c7eecc..e21845834 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -213,8 +213,8 @@ textarea {
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-  .box-shadow(@shadow);
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075),
+              0 0 8px rgba(82,168,236,.6));
   outline: 0;
   outline: thin dotted \9; /* IE6-9 */
 }
diff --git a/less/mixins.less b/less/mixins.less
index e5471cabd..eb4e10379 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -192,26 +192,26 @@
 // --------------------------------------------------
 
 // Border Radius
-.border-radius(@radius: 5px) {
-  -webkit-border-radius: @radius;
-     -moz-border-radius: @radius;
-          border-radius: @radius;
+.border-radius(@radius: 5px, ...) {
+  -webkit-border-radius: @arguments;
+     -moz-border-radius: @arguments;
+          border-radius: @arguments;
 }
 
 // Drop shadows
-.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
-  -webkit-box-shadow: @shadow;
-     -moz-box-shadow: @shadow;
-          box-shadow: @shadow;
+.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25), ...) {
+  -webkit-box-shadow: @arguments;
+     -moz-box-shadow: @arguments;
+          box-shadow: @arguments;
 }
 
 // Transitions
-.transition(@transition) {
-  -webkit-transition: @transition;
-     -moz-transition: @transition;
-      -ms-transition: @transition;
-       -o-transition: @transition;
-          transition: @transition;
+.transition(@transition, ...) {
+  -webkit-transition: @arguments;
+     -moz-transition: @arguments;
+      -ms-transition: @arguments;
+       -o-transition: @arguments;
+          transition: @arguments;
 }
 
 // Transformations
@@ -253,18 +253,18 @@
 
 // Background clipping
 // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
-.background-clip(@clip) {
-  -webkit-background-clip: @clip;
-     -moz-background-clip: @clip;
-          background-clip: @clip;
+.background-clip(@clip, ...) {
+  -webkit-background-clip: @arguments;
+     -moz-background-clip: @arguments;
+          background-clip: @arguments;
 }
 
 // Background sizing
-.background-size(@size){
-  -webkit-background-size: @size;
-     -moz-background-size: @size;
-       -o-background-size: @size;
-          background-size: @size;
+.background-size(@size, ...){
+  -webkit-background-size: @arguments;
+     -moz-background-size: @arguments;
+       -o-background-size: @arguments;
+          background-size: @arguments;
 }