From 3b005e4b4cca1498faad9933865bbdb93fd71867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Thu, 28 Nov 2019 10:30:47 +0100 Subject: [PATCH 1/3] Use :disabled too in form-check and form-file --- scss/forms/_form-check.scss | 7 ++++--- scss/forms/_form-file.scss | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss index c4837f83b681..fc986ced0306 100644 --- a/scss/forms/_form-check.scss +++ b/scss/forms/_form-check.scss @@ -82,9 +82,10 @@ border-color: $form-check-input-indeterminate-border-color; } - // Use disabled attribute instead of :disabled pseudo-class - // Workaround for: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11295231 - &[disabled] { + // Use disabled attribute in addition of :disabled pseudo-class + // See: https://github.com/twbs/bootstrap/issues/28247 + &[disabled], + &:disabled { pointer-events: none; filter: none; opacity: .5; diff --git a/scss/forms/_form-file.scss b/scss/forms/_form-file.scss index 3748f495cf49..39d3448af2a4 100644 --- a/scss/forms/_form-file.scss +++ b/scss/forms/_form-file.scss @@ -26,9 +26,10 @@ box-shadow: $form-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] ~ .form-file-label .form-file-text { + // Use disabled attribute in addition of :disabled pseudo-class + // See: https://github.com/twbs/bootstrap/issues/28247 + &[disabled] ~ .form-file-label .form-file-text, + &:disabled ~ .form-file-label .form-file-text { background-color: $form-file-disabled-bg; border-color: $form-file-disabled-border-color; } From 52957ae5003e8412812d76662982345d5e39078c Mon Sep 17 00:00:00 2001 From: Shohei Yoshida Date: Fri, 29 Nov 2019 23:39:07 +0900 Subject: [PATCH 2/3] Add [disabled] only to the problem selector --- scss/forms/_form-check.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss index fc986ced0306..d07058ddff01 100644 --- a/scss/forms/_form-check.scss +++ b/scss/forms/_form-check.scss @@ -82,14 +82,16 @@ border-color: $form-check-input-indeterminate-border-color; } - // Use disabled attribute in addition of :disabled pseudo-class - // See: https://github.com/twbs/bootstrap/issues/28247 - &[disabled], &:disabled { pointer-events: none; filter: none; opacity: .5; - + } + + // Use disabled attribute in addition of :disabled pseudo-class + // See: https://github.com/twbs/bootstrap/issues/28247 + &[disabled], + &:disabled { ~ .form-check-label { opacity: .5; } From 260fb9c0f65c7ccd4484e3cad31fdacc13fab262 Mon Sep 17 00:00:00 2001 From: Shohei Yoshida Date: Fri, 29 Nov 2019 23:44:49 +0900 Subject: [PATCH 3/3] lint --- scss/forms/_form-check.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss index d07058ddff01..7fd525968547 100644 --- a/scss/forms/_form-check.scss +++ b/scss/forms/_form-check.scss @@ -87,7 +87,7 @@ filter: none; opacity: .5; } - + // Use disabled attribute in addition of :disabled pseudo-class // See: https://github.com/twbs/bootstrap/issues/28247 &[disabled],