From 0bec1c889711823494d2821fa6e5841169df4797 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 18 Sep 2018 21:27:02 -0700 Subject: [PATCH] Add new variables for form feedback tooltips (#26959) Fixes #26886 --- scss/_variables.scss | 8 ++++++++ scss/mixins/_forms.scss | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 4f26be9d4a77..7b0d3a2f5a2c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -782,6 +782,14 @@ $tooltip-arrow-width: .8rem !default; $tooltip-arrow-height: .4rem !default; $tooltip-arrow-color: $tooltip-bg !default; +// Form tooltips must come after regular tooltips +$form-feedback-tooltip-padding-y: $tooltip-padding-y !default; +$form-feedback-tooltip-padding-x: $tooltip-padding-x !default; +$form-feedback-tooltip-font-size: $tooltip-font-size !default; +$form-feedback-tooltip-line-height: $line-height-base !default; +$form-feedback-tooltip-opacity: $tooltip-opacity !default; +$form-feedback-tooltip-border-radius: $tooltip-border-radius !default; + // Popovers diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index 90ecddee0c69..fbddd780394b 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -41,13 +41,13 @@ z-index: 5; display: none; max-width: 100%; // Contain to parent when possible - padding: $tooltip-padding-y $tooltip-padding-x; + padding: $form-feedback-tooltip-padding-y $form-feedback-tooltip-padding-x; margin-top: .1rem; - font-size: $tooltip-font-size; - line-height: $line-height-base; + font-size: $form-feedback-tooltip-font-size; + line-height: $form-feedback-tooltip-line-height; color: color-yiq($color); - background-color: rgba($color, $tooltip-opacity); - @include border-radius($tooltip-border-radius); + background-color: rgba($color, $form-feedback-tooltip-opacity); + @include border-radius($form-feedback-tooltip-border-radius); } .form-control {