From a6975a9ee2748ea68462010d88706471a7a81a22 Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 29 Oct 2014 17:46:47 -0400 Subject: [PATCH] Fixes for grouped/inline form label sizes --- src/definitions/collections/form.less | 6 ++++ src/themes/default/collections/form.variables | 34 +++++++++---------- src/themes/default/globals/site.variables | 2 +- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less index 4ef517d51..9f639a8a9 100755 --- a/src/definitions/collections/form.less +++ b/src/definitions/collections/form.less @@ -568,6 +568,9 @@ .ui.form .grouped.fields:last-child { margin-bottom: 0em; } +.ui.form .grouped.fields > label { + font-size: @groupedLabelFontSize; +} .ui.form .grouped.fields .field { display: block; float: none; @@ -791,6 +794,9 @@ .ui.form .inline.field > input { font-size: @inlineLabelFontSize; } +.ui.form .inline.fields .field > .ui.checkbox label { + padding-left: @inlineCheckboxLabelDistance; +} /* Label */ .ui.form .inline.fields .field > :first-child, diff --git a/src/themes/default/collections/form.variables b/src/themes/default/collections/form.variables index e3a3d8c21..109259bd8 100644 --- a/src/themes/default/collections/form.variables +++ b/src/themes/default/collections/form.variables @@ -24,22 +24,6 @@ @labelTextTransform: none; @labelColor: @textColor; -/* Grouped Labels */ -@groupedLabelDistance: @labelDistance; -@groupedLabelColor: @labelColor; -@groupedLabelMargin: @labelMargin; -@groupedLabelFontSize: @labelFontSize; -@groupedLabelFontWeight: @labelFontWeight; -@groupedLabelTextTransform: @labelTextTransform; - -/* Inline Labels */ -@inlineLabelMargin: 0em 1em 0em 0em; -@inlineLabelDistance: @labelDistance; -@inlineLabelColor: @labelColor; -@inlineLabelFontSize: @labelFontSize; -@inlineLabelFontWeight: @labelFontWeight; -@inlineLabelTextTransform: @labelTextTransform; - /* Input */ @inputWidth: 100%; @inputFontSize: 1em; @@ -171,10 +155,26 @@ @groupedMargin: @fieldMargin; @groupedFieldMargin: 0.5em 0em; +@groupedLabelDistance: @labelDistance; +@groupedLabelColor: @labelColor; +@groupedLabelMargin: @labelMargin; +@groupedLabelFontSize: @labelFontSize; +@groupedLabelFontWeight: @labelFontWeight; +@groupedLabelTextTransform: @labelTextTransform; + + /* Inline */ -@inlineLabelFontSize: 1em; +@inlineLabelFontSize: @labelFontSize; @inlineLabelVerticalAlign: middle; @inlineGroupedFieldLabelDistance: 0.5rem; +@inlineCheckboxLabelDistance: 1.75em; + +@inlineLabelMargin: 0em 1em 0em 0em; +@inlineLabelDistance: @labelDistance; +@inlineLabelColor: @labelColor; +@inlineLabelFontSize: @labelFontSize; +@inlineLabelFontWeight: @labelFontWeight; +@inlineLabelTextTransform: @labelTextTransform; /* Sizes */ @small: 0.875em; diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index 4a06bbf4e..a40d52efe 100644 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -291,7 +291,7 @@ @circularRadius : 500rem; @borderColor : rgba(39, 41, 43, 0.15); -@selectedBorderColor : rgba(39, 41, 43, 0.2); +@selectedBorderColor : rgba(39, 41, 43, 0.3); @solidBorderColor : #D4D4D5; @solidSelectedBorderColor : #BEBEBF;