aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-05-08 14:20:54 -0700
committerMark Otto <[email protected]>2016-05-08 14:20:54 -0700
commit399fdb8ebe40a2563dcfc3fbf0e459c1889ee24e (patch)
tree4f3af6eb533aebcdedf60541d3541a4b32f2128a
parent80341bf70975c8626ffe7f5d9b5037a3ba223462 (diff)
parentb21750cbb7af6bed960b709ae13f5e810bd32943 (diff)
downloadbootstrap-399fdb8ebe40a2563dcfc3fbf0e459c1889ee24e.tar.xz
bootstrap-399fdb8ebe40a2563dcfc3fbf0e459c1889ee24e.zip
Merge pull request #19735 from MatthewRayfield/v4-custom-select-disabled-styling
Add disabled styling for .custom-select
-rw-r--r--scss/_custom-forms.scss6
-rw-r--r--scss/_variables.scss4
2 files changed, 9 insertions, 1 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index 8222a65b0..a5f0bdfc4 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -171,6 +171,12 @@
}
}
+ &: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;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index be330d81f..a1e8e5bea 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -382,8 +382,10 @@ $custom-radio-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='h
$custom-select-padding-x: .75rem !default;
$custom-select-padding-y: .375rem !default;
$custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator
-$custom-select-color: $input-color !default;
+$custom-select-color: $input-color !default;
+$custom-select-disabled-color: $gray-light !default;
$custom-select-bg: #fff !default;
+$custom-select-disabled-bg: $gray-lighter !default;
$custom-select-bg-size: 8px 10px !default; // In pixels because image dimensions
$custom-select-indicator: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23333' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") !default;
$custom-select-border-width: $input-btn-border-width !default;