From bb4af05d229e1db70f657824caed1a7a8725c8a2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 2 Oct 2016 18:15:55 -0700 Subject: Fixes #20799: Apply same color change to disabled inline radios/checkboxes (#20826) --- scss/_forms.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 263a8bc15..6ea5d3dbc 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -239,6 +239,7 @@ select.form-control-lg { } &.disabled { + color: $text-muted; cursor: $cursor-disabled; } } -- cgit v1.2.3 From 59d067925084aa8bb5b5b9fa775fa6be85d64937 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 2 Oct 2016 18:28:37 -0700 Subject: Only override input border-radius as part of .form-control to avoid bug with iOS Safari (alt fix for #20247) (#20695) --- scss/_forms.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 6ea5d3dbc..59465ee6c 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -18,8 +18,16 @@ background-image: none; background-clip: padding-box; border: $input-btn-border-width solid $input-border-color; + // Note: This has no effect on `s in CSS. - @include border-radius($input-border-radius); + @if $enable-rounded { + // Manually use the if/else instead of the mixin to account for iOS override + border-radius: $input-border-radius; + } @else { + // Otherwise undo the iOS default + border-radius: 0; + } + @include box-shadow($input-box-shadow); @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s); -- cgit v1.2.3 From cab2d5951d311640e64990a694dc61876389b6fd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2016 16:00:30 -0700 Subject: Ensure input groups behavior appropriately in inline forms Overrides the default width: 100% with an auto. Fixes #20752. --- scss/_forms.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 59465ee6c..5f5b26146 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -330,6 +330,7 @@ select.form-control-lg { .input-group { display: inline-table; + width: auto; vertical-align: middle; .input-group-addon, -- cgit v1.2.3 From 55e130f88f8372bd70cfb60ae360376c98ff6b97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2016 16:16:13 -0700 Subject: Update static form control - Remove margin-bottom override in favor of .mb-0 utility class - Apply the input line-height styles to match - Remove the min-height to match the input --- scss/_forms.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 5f5b26146..2023aa013 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -132,12 +132,10 @@ select.form-control { // horizontal form layout. .form-control-static { - min-height: $input-height; // Size it appropriately next to real form controls padding-top: $input-padding-y; padding-bottom: $input-padding-y; - // Remove default margin from `p` - margin-bottom: 0; + line-height: $input-line-height; &.form-control-sm, &.form-control-lg { -- cgit v1.2.3 From 53ce4da835a44ed6d238ffa04afa4b7a1027ed94 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2016 16:17:48 -0700 Subject: add transparent border to match .form-control height --- scss/_forms.scss | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 2023aa013..34a6fef63 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -136,6 +136,8 @@ select.form-control { padding-top: $input-padding-y; padding-bottom: $input-padding-y; line-height: $input-line-height; + border: solid transparent; + border-width: 1px 0; &.form-control-sm, &.form-control-lg { -- cgit v1.2.3 From 9ac7e868dfd16c33e7f418268deca786472f1408 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2016 16:18:05 -0700 Subject: remove un-needed comment --- scss/_forms.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 34a6fef63..d27b646d0 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -132,7 +132,6 @@ select.form-control { // horizontal form layout. .form-control-static { - // Size it appropriately next to real form controls padding-top: $input-padding-y; padding-bottom: $input-padding-y; line-height: $input-line-height; -- cgit v1.2.3 From 0c467e7b29e2dd601e51b2af161c0546a79d432c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2016 18:04:30 -0700 Subject: Match the height of select.form-control with input.form-control Uses a local variable and some calc love to counteract the border-width (times 2) from the height of the select. Fixes #17194 and nullifies #19967. --- scss/_forms.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index d27b646d0..be19a0795 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -66,7 +66,8 @@ select.form-control { &:not([size]):not([multiple]) { - height: $input-height; + $select-border-width: ($border-width * 2); + height: calc(#{$input-height} - #{$select-border-width}); } &:focus::-ms-value { -- cgit v1.2.3