From 00e8c48a2765fd6481957489483cbac5a7064a07 Mon Sep 17 00:00:00 2001 From: andresgalante Date: Mon, 1 Oct 2018 09:56:53 -0300 Subject: [PATCH 1/3] adds font weight options for form controls and custom select --- scss/_custom-forms.scss | 1 + scss/_forms.scss | 1 + scss/_variables.scss | 2 ++ 3 files changed, 4 insertions(+) diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 8ef2e87b0be5..ca52bc32c5ea 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -166,6 +166,7 @@ width: 100%; height: $custom-select-height; padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x; + font-weight: $custom-select-font-weight; line-height: $custom-select-line-height; color: $custom-select-color; vertical-align: middle; diff --git a/scss/_forms.scss b/scss/_forms.scss index cd9a423f7bf2..88c7c2f9d768 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -10,6 +10,7 @@ height: $input-height; padding: $input-padding-y $input-padding-x; font-size: $font-size-base; + font-weight: $input-font-weight; line-height: $input-line-height; color: $input-color; background-color: $input-bg; diff --git a/scss/_variables.scss b/scss/_variables.scss index 9ac52e3d3201..e9ee3b060be9 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -423,6 +423,7 @@ $label-margin-bottom: .5rem !default; $input-padding-y: $input-btn-padding-y !default; $input-padding-x: $input-btn-padding-x !default; $input-font-size: $input-btn-font-size !default; +$input-font-weight: $font-weight-normal !default; $input-line-height: $input-btn-line-height !default; $input-padding-y-sm: $input-btn-padding-y-sm !default; @@ -523,6 +524,7 @@ $custom-select-padding-y: .375rem !default; $custom-select-padding-x: .75rem !default; $custom-select-height: $input-height !default; $custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator +$custom-select-font-weight: $input-font-weight !default; $custom-select-line-height: $input-line-height !default; $custom-select-color: $input-color !default; $custom-select-disabled-color: $gray-600 !default; From e19656a6ce57290bf3096dce550ac22f92879752 Mon Sep 17 00:00:00 2001 From: andresgalante Date: Tue, 2 Oct 2018 08:04:31 -0300 Subject: [PATCH 2/3] changes the reference from font weight normal to base --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index e9ee3b060be9..a48fc9eb9957 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -423,7 +423,7 @@ $label-margin-bottom: .5rem !default; $input-padding-y: $input-btn-padding-y !default; $input-padding-x: $input-btn-padding-x !default; $input-font-size: $input-btn-font-size !default; -$input-font-weight: $font-weight-normal !default; +$input-font-weight: $font-weight-base !default; $input-line-height: $input-btn-line-height !default; $input-padding-y-sm: $input-btn-padding-y-sm !default; From 2de8aa102bdec7ee2379b5934fe6d9c64008e387 Mon Sep 17 00:00:00 2001 From: andresgalante Date: Fri, 5 Oct 2018 08:53:28 -0300 Subject: [PATCH 3/3] adds a font weight variable to custom file inputs --- scss/_custom-forms.scss | 1 + scss/_variables.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index ca52bc32c5ea..0e46ad6c008c 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -280,6 +280,7 @@ z-index: 1; height: $custom-file-height; padding: $custom-file-padding-y $custom-file-padding-x; + font-weight: $custom-file-font-weight; line-height: $custom-file-line-height; color: $custom-file-color; background-color: $custom-file-bg; diff --git a/scss/_variables.scss b/scss/_variables.scss index a48fc9eb9957..86314460950c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -581,6 +581,7 @@ $custom-file-disabled-bg: $input-disabled-bg !default; $custom-file-padding-y: $input-padding-y !default; $custom-file-padding-x: $input-padding-x !default; $custom-file-line-height: $input-line-height !default; +$custom-file-font-weight: $input-font-weight !default; $custom-file-color: $input-color !default; $custom-file-bg: $input-bg !default; $custom-file-border-width: $input-border-width !default;