From d72ef55d006828a64452c62aba3dae49928bc4d1 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 2 Mar 2021 06:09:14 -0800
Subject: [PATCH] Reset select:disabled opacity and null-ify color to fix
 rendering differences in Chrome

---
 scss/_reboot.scss    | 12 +++++++-----
 scss/_variables.scss |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 7b153d1a8456..22b9aaa60f26 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -420,12 +420,10 @@ textarea {
 }
 
 // Remove the inheritance of text transform in Firefox
-
 button,
 select {
   text-transform: none;
 }
-
 // Set the cursor for non-`<button>` buttons
 //
 // Details at https://github.com/twbs/bootstrap/pull/30562
@@ -433,11 +431,15 @@ select {
   cursor: pointer;
 }
 
-// Remove the inheritance of word-wrap in Safari.
-// See https://github.com/twbs/bootstrap/issues/24990
-
 select {
+  // Remove the inheritance of word-wrap in Safari.
+  // See https://github.com/twbs/bootstrap/issues/24990
   word-wrap: normal;
+
+  // Undo the opacity change from Chrome
+  &:disabled {
+    opacity: 1;
+  }
 }
 
 // Remove the dropdown arrow in Chrome from inputs built with datalists.
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 723f5a86bf31..4ffcf18edc45 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -796,8 +796,8 @@ $form-select-indicator-padding:     $form-select-padding-x * 3 !default; // Extr
 $form-select-font-weight:           $input-font-weight !default;
 $form-select-line-height:           $input-line-height !default;
 $form-select-color:                 $input-color !default;
-$form-select-disabled-color:        $gray-600 !default;
 $form-select-bg:                    $input-bg !default;
+$form-select-disabled-color:        null !default;
 $form-select-disabled-bg:           $gray-200 !default;
 $form-select-disabled-border-color: $input-disabled-border-color !default;
 $form-select-bg-position:           right $form-select-padding-x center !default;