diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 6ef4b19101..7d65680eca 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 14df20d4a5..30eb71c181 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -23,6 +23,19 @@ text-indent: 100%; white-space: nowrap; } +.input-block-level { + display: block; + width: 100%; + min-height: 28px; + /* Make inputs at least the height of their button counterpart */ + + /* Makes inputs behave like true block-level elements */ + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} .hidden { display: none; visibility: hidden; @@ -160,17 +173,9 @@ /* Makes inputs behave like true block-level elements */ -webkit-box-sizing: border-box; - /* Older Webkit */ - -moz-box-sizing: border-box; - /* Older FF */ - -ms-box-sizing: border-box; - /* IE8 */ - box-sizing: border-box; - /* CSS3 spec*/ - } .input-prepend input[class*="span"], .input-append input[class*="span"] { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 65b63118c9..e3572169d9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -117,6 +117,19 @@ textarea { text-indent: 100%; white-space: nowrap; } +.input-block-level { + display: block; + width: 100%; + min-height: 28px; + /* Make inputs at least the height of their button counterpart */ + + /* Makes inputs behave like true block-level elements */ + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/less/mixins.less b/less/mixins.less index 8ff5efe503..b01a32b43f 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -107,6 +107,7 @@ white-space: nowrap; } + // FONTS // -------------------------------------------------- @@ -142,9 +143,19 @@ } -// Form field states (used in forms.less) +// FORMS // -------------------------------------------------- +// Block level inputs +.input-block-level { + display: block; + width: 100%; + min-height: 28px; /* Make inputs at least the height of their button counterpart */ + /* Makes inputs behave like true block-level elements */ + .box-sizing(border-box); +} + + // Mixin for form field states .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { // Set the text color diff --git a/less/responsive.less b/less/responsive.less index 6399c1ecdf..c403760f01 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -182,14 +182,7 @@ select[class*="span"], textarea[class*="span"], .uneditable-input { - display: block; - width: 100%; - min-height: 28px; /* Make inputs at least the height of their button counterpart */ - /* Makes inputs behave like true block-level elements */ - -webkit-box-sizing: border-box; /* Older Webkit */ - -moz-box-sizing: border-box; /* Older FF */ - -ms-box-sizing: border-box; /* IE8 */ - box-sizing: border-box; /* CSS3 spec*/ + .input-block-level(); } // But don't let it screw up prepend/append inputs .input-prepend input[class*="span"],