From: Mark Otto <otto@github.com>
Date: Thu, 14 Mar 2013 20:25:59 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~603
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00169b48bd69ee0e203cfb557de99887811b924e;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	less/grid.less
---

00169b48bd69ee0e203cfb557de99887811b924e
diff --cc less/forms.less
index 2ec53f8bbc,30af1692b1..841966bfe9
--- a/less/forms.less
+++ b/less/forms.less
@@@ -55,9 -55,10 +55,9 @@@ input[type="search"]
  input[type="tel"],
  input[type="color"] {
    display: inline-block;
 -  .box-sizing(border-box); // Makes inputs behave like true block-level elements
    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;
diff --cc less/grid.less
index ded99b9bd6,01b31de67f..1774d90b22
--- a/less/grid.less
+++ b/less/grid.less
@@@ -16,8 -16,12 +16,8 @@@
  }
  [class^="span"] {
    min-height: 1px;
-   padding-left:  @grid-gutter-width / 2;
-   padding-right: @grid-gutter-width / 2;
+   padding-left:  (@grid-gutter-width / 2);
+   padding-right: (@grid-gutter-width / 2);
 -  // Proper box-model (padding doesn't add to width)
 -  -webkit-box-sizing: border-box;
 -     -moz-box-sizing: border-box;
 -          box-sizing: border-box;
  }
  
  // Responsive: Tablets and up