From 1d5b25821b56959f3ed102e78a481c7aebfdd7de Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 22 Oct 2014 11:39:29 -0400 Subject: [PATCH] Fix errored dropdown styles inside forms --- src/definitions/collections/form.less | 20 ++++++++++++++----- src/themes/default/collections/form.variables | 10 +++++++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less index ce5612a30..4ef517d51 100755 --- a/src/definitions/collections/form.less +++ b/src/definitions/collections/form.less @@ -65,14 +65,23 @@ font-weight: @labelFontWeight; text-transform: @labelTextTransform; } -.ui.form .grouped.fields > label, -.ui.form .inline.fields > label { +.ui.form .grouped.fields > label { margin: @groupedLabelMargin; color: @groupedLabelColor; font-size: @groupedLabelFontSize; font-weight: @groupedLabelFontWeight; text-transform: @groupedLabelTextTransform; } +.ui.form .inline.fields > label { + display: inline-block; + vertical-align: middle; + + margin: @inlineLabelMargin; + color: @inlineLabelColor; + font-size: @inlineLabelFontSize; + font-weight: @inlineLabelFontWeight; + text-transform: @inlineLabelTextTransform; +} /*-------------------- Standard Inputs @@ -393,15 +402,15 @@ } .ui.form .fields.error .field .ui.dropdown, .ui.form .field.error .ui.dropdown { - box-shadow: 0px 0px 0px 1px @formErrorBorder !important; + border-color: @formErrorBorder !important; } .ui.form .fields.error .field .ui.dropdown:hover, .ui.form .field.error .ui.dropdown:hover { - box-shadow: 0px 0px 0px 1px @formErrorBorder !important; + border-color: @formErrorBorder !important; } .ui.form .fields.error .field .ui.dropdown:hover .menu, .ui.form .field.error .ui.dropdown:hover .menu { - box-shadow: 0px 1px 0px 1px @formErrorBorder; + border-color: @formErrorBorder; } /* Hover */ .ui.form .fields.error .field .ui.dropdown .menu .item:hover, @@ -759,6 +768,7 @@ } .ui.form .inline.fields .field { display: inline-block; + float: none; margin: @inlineFieldsMargin; padding: 0em; } diff --git a/src/themes/default/collections/form.variables b/src/themes/default/collections/form.variables index fb314fb46..e3a3d8c21 100644 --- a/src/themes/default/collections/form.variables +++ b/src/themes/default/collections/form.variables @@ -24,7 +24,7 @@ @labelTextTransform: none; @labelColor: @textColor; -/* Grouped / Inline Labels */ +/* Grouped Labels */ @groupedLabelDistance: @labelDistance; @groupedLabelColor: @labelColor; @groupedLabelMargin: @labelMargin; @@ -32,6 +32,14 @@ @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;