From 85765210cd2ca0f27303460b7837aca69228d2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Mon, 31 Oct 2022 19:29:04 +0100 Subject: [PATCH] Fix disabled floating labels color --- .bundlewatch.config.json | 2 +- scss/_variables.scss | 21 +++++++++++---------- scss/forms/_floating-labels.scss | 4 ++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 0b907cb6b0..c52cee2871 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -30,7 +30,7 @@ }, { "path": "./dist/css/bootstrap.min.css", - "maxSize": "27.5 kB" + "maxSize": "27.75 kB" }, { "path": "./dist/js/bootstrap.bundle.js", diff --git a/scss/_variables.scss b/scss/_variables.scss index af72ef2043..1c23cf2d98 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -996,16 +996,17 @@ $form-file-button-hover-bg: shade-color($form-file-button-bg, 5%) !default // scss-docs-end form-file-variables // scss-docs-start form-floating-variables -$form-floating-height: add(3.5rem, $input-height-border) !default; -$form-floating-line-height: 1.25 !default; -$form-floating-padding-x: $input-padding-x !default; -$form-floating-padding-y: 1rem !default; -$form-floating-input-padding-t: 1.625rem !default; -$form-floating-input-padding-b: .625rem !default; -$form-floating-label-height: 1.875em !default; -$form-floating-label-opacity: .65 !default; -$form-floating-label-transform: scale(.85) translateY(-.5rem) translateX(.15rem) !default; -$form-floating-transition: opacity .1s ease-in-out, transform .1s ease-in-out !default; +$form-floating-height: add(3.5rem, $input-height-border) !default; +$form-floating-line-height: 1.25 !default; +$form-floating-padding-x: $input-padding-x !default; +$form-floating-padding-y: 1rem !default; +$form-floating-input-padding-t: 1.625rem !default; +$form-floating-input-padding-b: .625rem !default; +$form-floating-label-height: 1.875em !default; +$form-floating-label-opacity: .65 !default; +$form-floating-label-transform: scale(.85) translateY(-.5rem) translateX(.15rem) !default; +$form-floating-label-disabled-color: $gray-600 !default; +$form-floating-transition: opacity .1s ease-in-out, transform .1s ease-in-out !default; // scss-docs-end form-floating-variables // Form validation diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss index e5e35d326d..aaed538458 100644 --- a/scss/forms/_floating-labels.scss +++ b/scss/forms/_floating-labels.scss @@ -83,4 +83,8 @@ border-width: $input-border-width 0; // Required to properly position label text - as explained above } } + + > .form-control:disabled ~ label { + color: $form-floating-label-disabled-color; + } }