From fd35779f0e15df27a8a05459a000d84320d8bb00 Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Sun, 1 Mar 2015 10:01:14 +0100 Subject: Input group sizes: Properly position `.form-control-feedback` Ref https://github.com/twbs/bootstrap/issues/12868#issuecomment-76291513 Ref 7733f24 --- less/forms.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 8bfbc4ba6..69bdd9849 100644 --- a/less/forms.less +++ b/less/forms.less @@ -144,7 +144,7 @@ output { background-color: @input-bg-disabled; opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655 } - + &[disabled], fieldset[disabled] & { cursor: @cursor-disabled; @@ -376,12 +376,14 @@ input[type="checkbox"] { text-align: center; pointer-events: none; } -.input-lg + .form-control-feedback { +.input-lg + .form-control-feedback, +.input-group-lg + .form-control-feedback { width: @input-height-large; height: @input-height-large; line-height: @input-height-large; } -.input-sm + .form-control-feedback { +.input-sm + .form-control-feedback, +.input-group-sm + .form-control-feedback { width: @input-height-small; height: @input-height-small; line-height: @input-height-small; -- cgit v1.2.3 From df8010b815b8cc4d2f5854b9ec05ca05143be29e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Mar 2015 21:18:19 -0700 Subject: Fixes #15074: Manually handle input sizing in form groups instead of using mixins because nesting --- less/forms.less | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index e4b50629e..de1508d0c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -322,7 +322,19 @@ input[type="checkbox"] { } .form-group-sm { .form-control { - .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small); + height: @input-height-small; + padding: @padding-small-vertical @padding-small-horizontal; + font-size: @font-size-small; + line-height: @line-height-small; + border-radius: @input-border-radius-small; + } + select.form-control { + height: @input-height-small; + line-height: @input-height-small; + } + textarea.form-control, + select[multiple].form-control { + height: auto; } .form-control-static { height: @input-height-small; @@ -338,7 +350,19 @@ input[type="checkbox"] { } .form-group-lg { .form-control { - .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large); + height: @input-height-large; + padding: @padding-large-vertical @padding-large-horizontal; + font-size: @font-size-large; + line-height: @line-height-large; + border-radius: @input-border-radius-large; + } + select.form-control { + height: @input-height-large; + line-height: @input-height-large; + } + textarea.form-control, + select[multiple].form-control { + height: auto; } .form-control-static { height: @input-height-large; -- cgit v1.2.3 From b5fefefd49c79ff1e40ddb0d466f2f0e8f135cb9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Mar 2015 20:34:06 -0700 Subject: Match all other responsive utilities and use important on the display: table --- less/mixins/responsive-visibility.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins/responsive-visibility.less b/less/mixins/responsive-visibility.less index f7951c3d7..ecf1e979f 100644 --- a/less/mixins/responsive-visibility.less +++ b/less/mixins/responsive-visibility.less @@ -4,7 +4,7 @@ // More easily include all the states for responsive-utilities.less. .responsive-visibility() { display: block !important; - table& { display: table; } + table& { display: table !important; } tr& { display: table-row !important; } th&, td& { display: table-cell !important; } -- cgit v1.2.3 From 27da9b290a657ed4ab299943c59e133286fef9fd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Mar 2015 22:43:33 -0700 Subject: Fixes #15536: Resize .control-label's font-size and account for border on static form control in form groups --- less/forms.less | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index e4b50629e..0f42e8ac0 100644 --- a/less/forms.less +++ b/less/forms.less @@ -326,10 +326,10 @@ input[type="checkbox"] { } .form-control-static { height: @input-height-small; - padding: @padding-small-vertical @padding-small-horizontal; + min-height: (@line-height-computed + @font-size-small); + padding: (@padding-small-vertical + 1) @padding-small-horizontal; font-size: @font-size-small; line-height: @line-height-small; - min-height: (@line-height-computed + @font-size-small); } } @@ -342,10 +342,10 @@ input[type="checkbox"] { } .form-control-static { height: @input-height-large; - padding: @padding-large-vertical @padding-large-horizontal; + min-height: (@line-height-computed + @font-size-large); + padding: (@padding-large-vertical + 1) @padding-large-horizontal; font-size: @font-size-large; line-height: @line-height-large; - min-height: (@line-height-computed + @font-size-large); } } @@ -561,6 +561,7 @@ input[type="checkbox"] { @media (min-width: @screen-sm-min) { .control-label { padding-top: ((@padding-large-vertical * @line-height-large) + 1); + font-size: @font-size-large; } } } @@ -568,6 +569,7 @@ input[type="checkbox"] { @media (min-width: @screen-sm-min) { .control-label { padding-top: (@padding-small-vertical + 1); + font-size: @font-size-small; } } } -- cgit v1.2.3 From d6acfd3ef410e705b0b6d5d921cdcf77182faa8e Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Sat, 4 Apr 2015 13:18:16 +0300 Subject: Fix theme.css .btn[disabled] styles. --- less/theme.less | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index 6f2eb6212..afac3a8aa 100644 --- a/less/theme.less +++ b/less/theme.less @@ -28,6 +28,12 @@ .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); } + &.disabled, + &[disabled], + fieldset[disabled] & { + .box-shadow(none); + } + .badge { text-shadow: none; } @@ -53,10 +59,17 @@ } &.disabled, - &:disabled, - &[disabled] { - background-color: darken(@btn-color, 12%); - background-image: none; + &[disabled], + fieldset[disabled] & { + &, + &:hover, + &:focus, + &.focus, + &:active, + &.active { + background-color: darken(@btn-color, 12%); + background-image: none; + } } } -- cgit v1.2.3