diff --git a/scss/_variables.scss b/scss/_variables.scss index a78e97f4f11a..8035e1adfc5c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -578,7 +578,7 @@ $input-bg: $white !default; $input-disabled-bg: $gray-200 !default; $input-disabled-border-color: null !default; -$input-color: $gray-700 !default; +$input-color: $body-color !default; $input-border-color: $gray-400 !default; $input-border-width: $input-btn-border-width !default; $input-box-shadow: $box-shadow-inset !default; @@ -756,14 +756,12 @@ $form-file-padding-x-lg: $input-padding-x-lg !default; $form-file-font-size-lg: $input-font-size-lg !default; $form-file-height-lg: $input-height-lg !default; -$form-floating-height: 3.5rem !default; +$form-floating-height: add(3.75rem, $input-height-border) !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: .375rem !default; -$form-floating-label-padding-y: $form-floating-input-padding-b !default; +$form-floating-input-padding-t: 1.75rem !default; +$form-floating-input-padding-b: .5rem !default; $form-floating-label-font-size: .85rem !default; -$form-floating-label-color: $gray-500 !default; // Form validation diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss index 418b37bf6ad7..7660ec52b3b6 100644 --- a/scss/forms/_floating-labels.scss +++ b/scss/forms/_floating-labels.scss @@ -4,7 +4,8 @@ position: relative; > label, - > .form-control { + > .form-control, + > .form-select { height: $form-floating-height; padding: $form-floating-padding-y $form-floating-padding-x; } @@ -16,7 +17,6 @@ display: block; width: 100%; margin-bottom: 0; // Override default `