From 7d7500e676a6a548818e27486551dd7f2785396f Mon Sep 17 00:00:00 2001 From: jlukic Date: Sat, 2 Aug 2014 11:49:28 -0400 Subject: [PATCH] Continues adding missing variables from form variations --- src/definitions/collections/form.less | 79 ++++++++++++++++--- .../default/collections/form.variables | 15 +++- 2 files changed, 80 insertions(+), 14 deletions(-) diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less index 0ad40e0c3..3359667e5 100755 --- a/src/definitions/collections/form.less +++ b/src/definitions/collections/form.less @@ -487,7 +487,7 @@ /* Grouped Vertically */ .ui.form .grouped.fields { - margin: 0em 0em 1em; + margin: @groupedMargin } .ui.form .grouped.fields:last-child { margin-bottom: 0em; @@ -495,7 +495,7 @@ .ui.form .grouped.fields .field { display: block; float: none; - margin: 0.5em 0em; + margin: @groupedFieldMargin; padding: 0em; } @@ -520,8 +520,8 @@ clear: none; float: left; box-sizing: border-box; - padding-left: 1%; - padding-right: 1%; + padding-left: @gutterWidth; + padding-right: @gutterWidth; } .ui.form .fields > .field:first-child { border-left: none; @@ -531,19 +531,19 @@ /* Other Combinations */ .ui.form .two.fields > .fields, .ui.form .two.fields > .field { - width: 50%; + width: @twoColumn; } .ui.form .three.fields > .fields, .ui.form .three.fields > .field { - width: 33.333%; + width: @threeColumn; } .ui.form .four.fields > .fields, .ui.form .four.fields > .field { - width: 25%; + width: @fourColumn; } .ui.form .five.fields > .fields, .ui.form .five.fields > .field { - width: 20%; + width: @fiveColumn; } /* Swap to full width on mobile */ @@ -556,7 +556,7 @@ .ui.form .four.fields > .field, .ui.form .five.fields > .fields, .ui.form .five.fields > .field { - width: 100%; + width: @oneColumn; padding-left: 0%; padding-right: 0%; } @@ -571,6 +571,19 @@ /* Sizing Combinations */ + +.ui.form .fields .wide.field { + width: @oneWide; + padding-left: @gutterWidth; + padding-right: @gutterWidth; +} +.ui.form .fields .wide.field:first-child { + padding-left: 0%; +} +.ui.form .fields .wide.field:last-child { + padding-right: 0%; +} + .ui.form .one.wide.field { width: @oneWide !important; } @@ -620,6 +633,37 @@ width: @sixteenWide !important; } +/* Swap to full width on mobile */ +@media only screen and (max-width : 767px) { + .ui.form .two.fields > .fields, + .ui.form .two.fields > .field, + .ui.form .three.fields > .fields, + .ui.form .three.fields > .field, + .ui.form .four.fields > .fields, + .ui.form .four.fields > .field, + .ui.form .five.fields > .fields, + .ui.form .five.fields > .field, + .ui.form .fields > .two.wide.field, + .ui.form .fields > .three.wide.field, + .ui.form .fields > .four.wide.field, + .ui.form .fields > .five.wide.field, + .ui.form .fields > .six.wide.field, + .ui.form .fields > .seven.wide.field, + .ui.form .fields > .eight.wide.field, + .ui.form .fields > .nine.wide.field, + .ui.form .fields > .ten.wide.field, + .ui.form .fields > .eleven.wide.field, + .ui.form .fields > .twelve.wide.field, + .ui.form .fields > .thirteen.wide.field, + .ui.form .fields > .fourteen.wide.field, + .ui.form .fields > .fifteen.wide.field, + .ui.form .fields > .sixteen.wide.field { + width: @oneColumn; + padding-left: 0%; + padding-right: 0%; + } +} + /*-------------------- Inline Fields ---------------------*/ @@ -637,19 +681,18 @@ .ui.form .inline.field > label, .ui.form .inline.field > p, .ui.form .inline.field > input { - display: inline-block; width: auto; margin-top: 0em; margin-bottom: 0em; - vertical-align: middle; - font-size: 1em; + vertical-align: @inlineLabelVerticalAlign; + font-size: @inlineLabelFontSize; } .ui.form .inline.fields .field > input, .ui.form .inline.field > input { - font-size: 1em; + font-size: @inlineLabelFontSize; } /* Label */ @@ -672,7 +715,17 @@ font-size: @small; } +/* Medium */ +.ui.form { + font-size: @medium; +} + /* Large */ .ui.large.form { font-size: @large; } + +/* Huge */ +.ui.huge.form { + font-size: @huge; +} diff --git a/src/themes/packages/default/collections/form.variables b/src/themes/packages/default/collections/form.variables index 1221f9b35..5a22e40ae 100755 --- a/src/themes/packages/default/collections/form.variables +++ b/src/themes/packages/default/collections/form.variables @@ -121,9 +121,22 @@ Variations --------------------*/ +/* Grouped Fields */ +@groupedMargin: @fieldMargin; +@groupedFieldMargin: 0.5em 0em; + +/* Inline */ +@inlineLabelFontSize: 1em; +@inlineLabelVerticalAlign: middle; + +/* (x) Wide Field */ +@gutterWidth: 1.5%; + +/* Sizes */ @small: 0.875em; +@medium: auto; @large: 1.125em; - +@huge: 1.2em; /*------------------- Groups