From ebf904db41f1bca20d61682955052870dd6175bb Mon Sep 17 00:00:00 2001 From: Tristan Mugford Date: Mon, 24 Mar 2014 12:03:58 +0000 Subject: [PATCH] Fixes #4769. Added a variable to control text-transform of small in form labels. --- doc/includes/examples_sass_variables.html | 2 ++ doc/includes/form/examples_form_variables.html | 1 + scss/foundation/_settings.scss | 1 + scss/foundation/components/_forms.scss | 7 ++++--- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/includes/examples_sass_variables.html b/doc/includes/examples_sass_variables.html index 2d1f05489..2e154e01f 100644 --- a/doc/includes/examples_sass_variables.html +++ b/doc/includes/examples_sass_variables.html @@ -298,7 +298,9 @@ $form-spacing: rem-calc(16); $form-label-pointer: pointer; $form-label-font-size: rem-calc(14); $form-label-font-weight: 500; +$form-label-line-height: 1.5; $form-label-font-color: scale-color(#000, $lightness: 30%); +$form-label-small-transform: capitalize; $form-label-bottom-margin: rem-calc(3); $input-font-family: inherit; $input-font-color: rgba(0,0,0,0.75); diff --git a/doc/includes/form/examples_form_variables.html b/doc/includes/form/examples_form_variables.html index c7611e295..6d860836b 100644 --- a/doc/includes/form/examples_form_variables.html +++ b/doc/includes/form/examples_form_variables.html @@ -11,6 +11,7 @@ $form-label-font-size: rem-calc(14); $form-label-font-weight: 500; $form-label-line-height: 1.5; $form-label-font-color: scale-color(#000, $lightness: 30%); +$form-label-small-transform: capitalize; $form-label-bottom-margin: 0; $input-font-family: inherit; $input-font-color: rgba(0,0,0,0.75); diff --git a/scss/foundation/_settings.scss b/scss/foundation/_settings.scss index 4f6458df3..eb5041552 100644 --- a/scss/foundation/_settings.scss +++ b/scss/foundation/_settings.scss @@ -490,6 +490,7 @@ // $form-label-font-weight: normal; // $form-label-line-height: 1.5; // $form-label-font-color: scale-color(#000, $lightness: 30%); +// $form-label-small-transform: capitalize; // $form-label-bottom-margin: 0; // $input-font-family: inherit; // $input-font-color: rgba(0,0,0,0.75); diff --git a/scss/foundation/components/_forms.scss b/scss/foundation/components/_forms.scss index cd229375e..96afc77fe 100644 --- a/scss/foundation/components/_forms.scss +++ b/scss/foundation/components/_forms.scss @@ -19,6 +19,7 @@ $form-label-font-size: rem-calc(14) !default; $form-label-font-weight: normal !default; $form-label-line-height: 1.5 !default; $form-label-font-color: scale-color(#000, $lightness: 30%) !default; +$form-label-small-transform: capitalize !default; $form-label-bottom-margin: 0 !default; $input-font-family: inherit !default; $input-font-color: rgba(0,0,0,0.75) !default; @@ -315,7 +316,7 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default; &.inline { @include form-label(inline,false); } /* Styles for required inputs */ small { - text-transform: capitalize; + text-transform: $form-label-small-transform; color: scale-color($form-label-font-color, $lightness: 15%); } } @@ -390,7 +391,7 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default; @include radius($input-border-radius); } } - + /* Respect enforced amount of rows for textarea */ textarea[rows] { height: auto; @@ -467,7 +468,7 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default; color: scale-color($form-label-font-color, $lightness: 15%); background: transparent; padding: 0; - text-transform: capitalize; + text-transform: $form-label-small-transform; font-style: normal; font-size: 60%; margin: 0; -- 2.47.2