diff options
| author | Mark Otto <[email protected]> | 2017-06-13 20:15:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-06-13 20:15:42 -0700 |
| commit | 21b874d19dfee091ee64dd4db934850516d2d7b0 (patch) | |
| tree | e6489cd37f8c582fc5b21d23442f7ef5dc469ac9 /scss/_forms.scss | |
| parent | b95aa65c74e59224e97df75eb1a15d956ad31b71 (diff) | |
| parent | d7867377d939a8bb8a645ab3af8a6a650a78fc29 (diff) | |
| download | bootstrap-21b874d19dfee091ee64dd4db934850516d2d7b0.tar.xz bootstrap-21b874d19dfee091ee64dd4db934850516d2d7b0.zip | |
Merge branch 'v4-dev' into form-tweaks
Diffstat (limited to 'scss/_forms.scss')
| -rw-r--r-- | scss/_forms.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index c56cfd068..4b04c7d22 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -42,7 +42,7 @@ // Placeholder &::placeholder { - color: $input-color-placeholder; + color: $input-placeholder-color; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526. opacity: 1; } @@ -54,7 +54,7 @@ // don't honor that edge case; we style them as disabled anyway. &:disabled, &[readonly] { - background-color: $input-bg-disabled; + background-color: $input-disabled-bg; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655. opacity: 1; } |