diff options
| author | Catalin Zalog <[email protected]> | 2020-04-16 17:38:21 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-16 16:38:21 +0200 |
| commit | 3ff3680d4e9243e5e8e0715c7b7cffb43abd8de6 (patch) | |
| tree | 90831351ba12b870f0f2b8af167bf042c7ab8f61 /scss | |
| parent | df4be07a0256dedfbac3f9cc4c766e31169daa51 (diff) | |
| download | bootstrap-3ff3680d4e9243e5e8e0715c7b7cffb43abd8de6.tar.xz bootstrap-3ff3680d4e9243e5e8e0715c7b7cffb43abd8de6.zip | |
feat: removes `.form-text` display (#30598)
Co-authored-by: Martijn Cuppens <[email protected]>
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_variables.scss | 5 | ||||
| -rw-r--r-- | scss/forms/_form-text.scss | 1 | ||||
| -rw-r--r-- | scss/mixins/_forms.scss | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index 419ff1830..a6e47b285 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -570,7 +570,7 @@ $btn-transition: color .15s ease-in-out, background-color .15s ease // Forms $form-text-margin-top: .25rem !default; -$form-text-font-size: null !default; +$form-text-font-size: $small-font-size !default; $form-text-font-style: null !default; $form-text-color: $text-muted !default; @@ -772,7 +772,8 @@ $form-file-height-lg: $input-height-lg !default; // Form validation $form-feedback-margin-top: $form-text-margin-top !default; -$form-feedback-font-size: $small-font-size !default; +$form-feedback-font-size: $form-text-font-size !default; +$form-feedback-font-style: $form-text-font-style !default; $form-feedback-valid-color: $success !default; $form-feedback-invalid-color: $danger !default; diff --git a/scss/forms/_form-text.scss b/scss/forms/_form-text.scss index 3691afcfc..e25bbeb1d 100644 --- a/scss/forms/_form-text.scss +++ b/scss/forms/_form-text.scss @@ -3,7 +3,6 @@ // .form-text { - display: block; margin-top: $form-text-margin-top; @include font-size($form-text-font-size); font-style: $form-text-font-style; diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index 7abfd23bf..516658371 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -19,6 +19,7 @@ width: 100%; margin-top: $form-feedback-margin-top; @include font-size($form-feedback-font-size); + font-style: $form-feedback-font-style; color: $color; } |