From 2cc53ac0757e29fc8d6c0e1dde7477cc6e4affbc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 13 Jul 2019 13:50:34 -0700 Subject: [PATCH 1/4] Use :focus-within for .form-file focus state Fixes #26563, closes #26576, closes #29021. --- scss/forms/_form-file.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/forms/_form-file.scss b/scss/forms/_form-file.scss index bbc38a9f81e8..713524195f13 100644 --- a/scss/forms/_form-file.scss +++ b/scss/forms/_form-file.scss @@ -14,7 +14,7 @@ margin: 0; opacity: 0; - &:focus ~ .form-file-label { + &:focus-within ~ .form-file-label { border-color: $form-file-focus-border-color; box-shadow: $form-file-focus-box-shadow; } From a876a17fca1b28bdeafea8bd8e75744be51cf225 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 14 Jul 2019 21:45:08 -0700 Subject: [PATCH 2/4] Account for Edge and Firefox --- scss/forms/_form-file.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/forms/_form-file.scss b/scss/forms/_form-file.scss index 713524195f13..dbe10c61983c 100644 --- a/scss/forms/_form-file.scss +++ b/scss/forms/_form-file.scss @@ -14,6 +14,7 @@ margin: 0; opacity: 0; + &:focus ~ .form-file-label, &:focus-within ~ .form-file-label { border-color: $form-file-focus-border-color; box-shadow: $form-file-focus-box-shadow; From dc0999a72ee26fe022380c1307ebf9702299ed06 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 15 Jul 2019 20:40:12 -0700 Subject: [PATCH 3/4] Separate rulesets, add comment with note and link to PR --- scss/forms/_form-file.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scss/forms/_form-file.scss b/scss/forms/_form-file.scss index dbe10c61983c..108db7107ad8 100644 --- a/scss/forms/_form-file.scss +++ b/scss/forms/_form-file.scss @@ -14,7 +14,13 @@ margin: 0; opacity: 0; - &:focus ~ .form-file-label, + // Separate rules for :focus and :focus-within as IE doesn't support the latter, and + // thus ignores the entire ruleset. See https://github.com/twbs/bootstrap/pull/29036. + &:focus ~ .form-file-label { + border-color: $form-file-focus-border-color; + box-shadow: $form-file-focus-box-shadow; + } + &:focus-within ~ .form-file-label { border-color: $form-file-focus-border-color; box-shadow: $form-file-focus-box-shadow; From 1cbb7eeef5716344c5d11f0a8899d9aa5638229c Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Tue, 16 Jul 2019 12:03:14 +0200 Subject: [PATCH 4/4] Remove spaces --- scss/forms/_form-file.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/forms/_form-file.scss b/scss/forms/_form-file.scss index fe2cdbc11106..b3c0d0df0284 100644 --- a/scss/forms/_form-file.scss +++ b/scss/forms/_form-file.scss @@ -20,7 +20,7 @@ border-color: $form-file-focus-border-color; box-shadow: $form-file-focus-box-shadow; } - + &:focus-within ~ .form-file-label { border-color: $form-file-focus-border-color; box-shadow: $form-file-focus-box-shadow;