From 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:58:10 -0800 Subject: Fixes #12486: Restore full width inputs for input groups in inline forms and navbars --- less/forms.less | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index d97993318..df83c9d8d 100644 --- a/less/forms.less +++ b/less/forms.less @@ -133,9 +133,14 @@ output { .placeholder(); // Disabled and read-only inputs - // Note: HTML5 says that controls under a fieldset > legend:first-child won't - // be disabled if the fieldset is disabled. Due to implementation difficulty, - // we don't honor that edge case; we style them as disabled anyway. + // + // HTML5 says that controls under a fieldset > legend:first-child won't be + // disabled if the fieldset is disabled. Due to implementation difficulty, we + // don't honor that edge case; we style them as disabled anyway. + // + // Also note that we include `[disabled]` for IE8. All other browsers take the + // `:disabled` selector. + &:disabled, &[disabled], &[readonly], fieldset[disabled] & { @@ -348,6 +353,10 @@ input[type="checkbox"], width: auto; // Prevent labels from stacking above inputs in `.form-group` vertical-align: middle; } + // Input groups need that 100% width though + .input-group > .form-control { + width: 100%; + } .control-label { margin-bottom: 0; -- cgit v1.2.3 From a2f08158d032c1025ca0c6bf411b8282b606fb7b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 15:44:50 -0800 Subject: Nuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come until v4 --- less/forms.less | 4 ---- 1 file changed, 4 deletions(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index df83c9d8d..f607b8509 100644 --- a/less/forms.less +++ b/less/forms.less @@ -137,10 +137,6 @@ output { // HTML5 says that controls under a fieldset > legend:first-child won't be // disabled if the fieldset is disabled. Due to implementation difficulty, we // don't honor that edge case; we style them as disabled anyway. - // - // Also note that we include `[disabled]` for IE8. All other browsers take the - // `:disabled` selector. - &:disabled, &[disabled], &[readonly], fieldset[disabled] & { -- cgit v1.2.3