Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Déramond <juderamond@gmail.com>2022-10-31 21:29:04 +0300
committerJulien Déramond <juderamond@gmail.com>2022-10-31 21:36:39 +0300
commitca6892298637c0a73ec6dc88ada13443776d11e0 (patch)
tree622a500f769064421e3f9b2271467339466ff146
parentbaedc38758cb9bc844a6189b6460a6c74e780f2f (diff)
Fix disabled floating labels colormain-jd-fix-form-floating-disabled-colour
-rw-r--r--.bundlewatch.config.json2
-rw-r--r--scss/_variables.scss21
-rw-r--r--scss/forms/_floating-labels.scss4
3 files changed, 16 insertions, 11 deletions
diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json
index 105c8c1580..579276eedc 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;
+ }
}