From 4bc4a7d5b3cde63fd94fed5ae6a4f2e1b2379b0f Mon Sep 17 00:00:00 2001 From: Andres Galante Date: Mon, 13 Nov 2017 09:21:39 -0300 Subject: [PATCH 1/2] adds variables for form validation messages --- scss/_variables.scss | 2 ++ scss/mixins/_forms.scss | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 99a5179a8119..edd92b572ef9 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -515,6 +515,8 @@ $custom-file-text: ( // Form validation +$form-feedback-margin-top: .25rem !default; +$form-feedback-font-size: ($font-size-base * .875) !default; $form-feedback-valid-color: theme-color("success") !default; $form-feedback-invalid-color: theme-color("danger") !default; diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index cea803de3380..9fe889cf5623 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -30,8 +30,8 @@ .#{$state}-feedback { display: none; - margin-top: .25rem; - font-size: .875rem; + margin-top: $form-feedback-margin-top; + font-size: $form-feedback-font-size; color: $color; } From 12cbd9dd2baa7edb32d007ec5fc4c77f8212eaa0 Mon Sep 17 00:00:00 2001 From: Andres Galante Date: Mon, 13 Nov 2017 17:14:22 -0300 Subject: [PATCH 2/2] standarizes feedback and help messages on forms --- scss/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index edd92b572ef9..acea370fb23e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -515,8 +515,8 @@ $custom-file-text: ( // Form validation -$form-feedback-margin-top: .25rem !default; -$form-feedback-font-size: ($font-size-base * .875) !default; +$form-feedback-margin-top: $form-text-margin-top !default; +$form-feedback-font-size: $small-font-size !default; $form-feedback-valid-color: theme-color("success") !default; $form-feedback-invalid-color: theme-color("danger") !default;