From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 8 May 2016 21:20:54 +0000 (-0700)
Subject: Merge pull request #19735 from MatthewRayfield/v4-custom-select-disabled-styling
X-Git-Tag: v4.0.0-alpha.3~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=399fdb8ebe40a2563dcfc3fbf0e459c1889ee24e;p=thirdparty%2Fbootstrap.git

Merge pull request #19735 from MatthewRayfield/v4-custom-select-disabled-styling

Add disabled styling for .custom-select
---

399fdb8ebe40a2563dcfc3fbf0e459c1889ee24e
diff --cc scss/_custom-forms.scss
index 8222a65b0f,a15aa94746..a5f0bdfc48
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@@ -159,18 -159,14 +159,24 @@@
      border-color: $custom-select-focus-border-color;
      outline: none;
      @include box-shadow($custom-select-focus-box-shadow);
 +
 +    &::-ms-value {
 +      // For visual consistency with other platforms/browsers,
 +      // supress the default white text on blue background highlight given to
 +      // the selected option text when the (still closed) <select> receives focus
 +      // in IE and (under certain conditions) Edge.
 +      // See https://github.com/twbs/bootstrap/issues/19398.
 +      color: $input-color;
 +      background-color: $input-bg;
 +    }
    }
  
+   &:disabled {
+     color: $custom-select-disabled-color;
+     cursor: $cursor-disabled;
+     background-color: $custom-select-disabled-bg;
+   }
+ 
    // Hides the default caret in IE11
    &::-ms-expand {
      opacity: 0;