Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
	less/grid.less

1 files changed, 7 insertions, 7 deletions

diff --git a/less/forms.less b/less/forms.less
index 2ec53f8bb..841966bfe 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -21,8 +21,8 @@ legend {
   width: 100%;
   padding: 0;
   margin-bottom: @line-height-base;
-  font-size: @font-size-base * 1.5;
-  line-height: @line-height-base * 2;
+  font-size: (@font-size-base * 1.5);
+  line-height: (@line-height-base * 2);
   color: @grayDark;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
@@ -57,7 +57,7 @@ input[type="color"] {
   display: inline-block;
   min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
   padding: 6px 9px;
-  // margin-bottom: @line-height-base / 2;
+  // margin-bottom: (@line-height-base / 2);
   font-size: @font-size-base;
   line-height: @line-height-base;
   color: @gray;
@@ -167,7 +167,7 @@ textarea {
 .checkbox {
   display: block;
   min-height: @line-height-base; // clear the floating input if there is no label text
-  margin-bottom: @line-height-base / 2;
+  margin-bottom: (@line-height-base / 2);
   padding-left: 20px;
   label {
     display: inline;
@@ -185,7 +185,7 @@ textarea {
 }
 .radio + .radio,
 .checkbox + .checkbox {
-  margin-top: (@line-height-base / 4) * -1;
+  margin-top: ((@line-height-base / 4) * -1);
 }
 
 // Move the options list down to align with labels
@@ -358,7 +358,7 @@ select:focus:invalid {
 
 .help-block {
   display: block; // account for any element using help-block
-  margin-bottom: @line-height-base / 2;
+  margin-bottom: (@line-height-base / 2);
 }
 
 .help-inline {
@@ -529,7 +529,7 @@ select:focus:invalid {
     // Float the labels left
     .control-group > .control-label {
       float: left;
-      width: @component-offset-horizontal - 20;
+      width: (@component-offset-horizontal - 20);
       padding-top: 6px;
       text-align: right;
     }