diff options
| author | Shohei Yoshida <ysds.code@gmail.com> | 2019-11-28 15:35:46 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@gmail.com> | 2019-11-28 15:59:49 +0300 |
| commit | 0d148d88545c89128252bbd29e7df0a1d8c7aeba (patch) | |
| tree | 8e0bb65e69c52036ab5c1ed2c6d75a9977227485 | |
| parent | c24aaa6cbf8e0626746052131358adeeb3db6277 (diff) | |
V4: Add :disabled for disabled fieldset (#29762)
| -rw-r--r-- | scss/_custom-forms.scss | 12 | ||||
| -rw-r--r-- | scss/_forms.scss | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 5eb2bb7771..21e72da7dd 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -54,9 +54,9 @@ @include box-shadow($custom-control-indicator-active-box-shadow); } - // Use disabled attribute instead of :disabled pseudo-class - // Workaround for: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11295231 - &[disabled] { + // Use [disabled] and :disabled to work around https://github.com/twbs/bootstrap/issues/28247 + &[disabled], + &:disabled { ~ .custom-control-label { color: $custom-control-label-disabled-color; @@ -319,9 +319,9 @@ box-shadow: $custom-file-focus-box-shadow; } - // Use disabled attribute instead of :disabled pseudo-class - // Workaround for: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11295231 - &[disabled] ~ .custom-file-label { + // Use [disabled] and :disabled to work around https://github.com/twbs/bootstrap/issues/28247 + &[disabled] ~ .custom-file-label, + &:disabled ~ .custom-file-label { background-color: $custom-file-disabled-bg; } diff --git a/scss/_forms.scss b/scss/_forms.scss index f91789d656..b2edb7b27b 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -216,9 +216,9 @@ textarea.form-control { margin-top: $form-check-input-margin-y; margin-left: -$form-check-input-gutter; - // Use disabled attribute instead of :disabled pseudo-class - // Workaround for: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11295231 - &[disabled] ~ .form-check-label { + // Use [disabled] and :disabled for workaround https://github.com/twbs/bootstrap/issues/28247 + &[disabled] ~ .form-check-label, + &:disabled ~ .form-check-label { color: $text-muted; } } |