From d219b8b96479f3390f37a6d14f1ee3fc12192221 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 10 Mar 2013 13:24:07 -0500
Subject: [PATCH] Set border-box globally instead

---
 docs/assets/css/bootstrap.css | 18 ++++++------------
 less/buttons.less             |  1 -
 less/forms.less               |  1 -
 less/grid.less                |  4 ----
 less/progress-bars.less       |  1 -
 less/scaffolding.less         | 10 ++++++++++
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c93cebabea..d8a4517732 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -265,6 +265,12 @@ table {
   }
 }
 
+* {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
 html {
   font-size: 62.5%;
   -webkit-overflow-scrolling: touch;
@@ -730,9 +736,6 @@ pre code {
   min-height: 1px;
   padding-right: 10px;
   padding-left: 10px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
 }
 
 @media screen and (min-width: 768px) {
@@ -1065,9 +1068,6 @@ input[type="color"] {
   border-radius: 4px;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
   -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
      -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
        -o-transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -1663,9 +1663,6 @@ fieldset[disabled] .btn {
   width: 100%;
   padding-right: 0;
   padding-left: 0;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
 }
 
 .btn-block + .btn-block {
@@ -4419,9 +4416,6 @@ a.badge:focus {
   background-color: #428bca;
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
           box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
   -webkit-transition: width 0.6s ease;
      -moz-transition: width 0.6s ease;
        -o-transition: width 0.6s ease;
diff --git a/less/buttons.less b/less/buttons.less
index 7eaaeb13fa..801458a6f3 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -87,7 +87,6 @@
   width: 100%;
   padding-left: 0;
   padding-right: 0;
-  .box-sizing(border-box);
 }
 
 // Vertically space out multiple block buttons
diff --git a/less/forms.less b/less/forms.less
index b710b32fe5..2ec53f8bbc 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -55,7 +55,6 @@ 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;
diff --git a/less/grid.less b/less/grid.less
index a64ca9c88f..ded99b9bd6 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -18,10 +18,6 @@
   min-height: 1px;
   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
diff --git a/less/progress-bars.less b/less/progress-bars.less
index 89e9832684..5f62ae2799 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -62,7 +62,6 @@
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   background-color: @progress-bar-bg;
   .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
-  .box-sizing(border-box);
   .transition(width .6s ease);
 }
 
diff --git a/less/scaffolding.less b/less/scaffolding.less
index eee9cc93c6..973353c93b 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -3,6 +3,16 @@
 // --------------------------------------------------
 
 
+// Reset the box-sizing
+// -------------------------
+
+* {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+
 // Body reset
 // -------------------------