From ae89c3b874eda2326112d73851af35ed08e61e15 Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 12 Aug 2014 18:07:24 -0400 Subject: [PATCH] Resolved issues with inputs sizes not matching up due to line-height, several other fixes --- src/definitions/collections/form.less | 26 +++++++++++++++---- src/definitions/views/list.less | 8 +++--- .../default/collections/form.variables | 2 +- .../packages/default/globals/site.variables | 2 +- .../default/modules/dropdown.variables | 2 +- .../packages/default/views/list.variables | 7 ++--- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less index 99d3b4f21..6d1ef22a3 100755 --- a/src/definitions/collections/form.less +++ b/src/definitions/collections/form.less @@ -84,7 +84,6 @@ width: 100%; } -.ui.form textarea, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], @@ -92,6 +91,26 @@ .ui.form input[type="number"], .ui.form input[type="url"], .ui.form input[type="tel"] { + margin: 0em; + line-height: 1; + outline: none; + -webkit-appearance: none; + -webkit-tap-highlight-color: rgba(255, 255, 255, 0); + + padding: @inputVerticalPadding @inputHorizontalPadding; + font-size: @inputFontSize; + + background: @inputBackground; + border: @inputBorder; + color: @inputColor; + border-radius: @inputBorderRadius; + box-shadow: @inputBoxShadow; + box-sizing: border-box; + transition: @inputTransition; +} + +.ui.textarea, +.ui.form textarea { margin: 0em; padding: @inputVerticalPadding @inputHorizontalPadding; font-size: @inputFontSize; @@ -101,17 +120,14 @@ outline: none; color: @inputColor; - border-radius: 0.3125em; + border-radius: @inputBorderRadius; box-shadow: @inputBoxShadow; -webkit-appearance: none; -webkit-tap-highlight-color: rgba(255, 255, 255, 0); box-sizing: border-box; transition: @inputTransition; -} -.ui.textarea, -.ui.form textarea { font-size: @textAreaFontSize; height: @textAreaHeight; diff --git a/src/definitions/views/list.less b/src/definitions/views/list.less index 5a322d58b..415a45761 100755 --- a/src/definitions/views/list.less +++ b/src/definitions/views/list.less @@ -94,13 +94,15 @@ ol.ui.list ol, .ui.list .item > .icon { display: table-cell; margin: 0em; + height: 1em; padding-top: @iconOffset; padding-right: @iconDistance; - vertical-align: @iconAlign; + vertical-align: @iconContentVerticalAlign; transition: @iconTransition; } .ui.list .item > .icon:only-child { display: inline-block; + vertical-align: @iconVerticalAlign; } @@ -132,13 +134,13 @@ ol.ui.list ol, .ui.list .item > .icon + .content { display: table-cell; padding-left: @contentDistance; - vertical-align: @contentAlign; + vertical-align: @contentVerticalAlign; } .ui.list .item > .image + .content, .ui.list .item > .icon + .content { display: table-cell; padding-left: @contentDistance; - vertical-align: @contentAlign; + vertical-align: @contentVerticalAlign; } .ui.list .item > img.image + .content { display: inline-block; diff --git a/src/themes/packages/default/collections/form.variables b/src/themes/packages/default/collections/form.variables index 8af012664..219d5b777 100755 --- a/src/themes/packages/default/collections/form.variables +++ b/src/themes/packages/default/collections/form.variables @@ -23,7 +23,7 @@ @inputWidth: 100%; @inputFontSize: 1em; -@inputVerticalPadding: 0.65em; +@inputVerticalPadding: 0.8em; @inputHorizontalPadding: 1em; @inputBackground: #FFFFFF; @inputBorder: 1px solid @borderColor; diff --git a/src/themes/packages/default/globals/site.variables b/src/themes/packages/default/globals/site.variables index 8ab4e45bb..113807f74 100755 --- a/src/themes/packages/default/globals/site.variables +++ b/src/themes/packages/default/globals/site.variables @@ -25,7 +25,7 @@ @green : #2ECC40; @orange : #FF851B; @pink : #D9499A; -@purple : #564F8A; +@purple : #A24096; @red : #FF4136; @teal : #39CCCC; @yellow : #FFCB08; diff --git a/src/themes/packages/default/modules/dropdown.variables b/src/themes/packages/default/modules/dropdown.variables index b76f5c543..7292dcb9d 100644 --- a/src/themes/packages/default/modules/dropdown.variables +++ b/src/themes/packages/default/modules/dropdown.variables @@ -74,7 +74,7 @@ /* Selection */ @selectionBackground: @white; @selectionDisplay: inline-block; -@selectionVerticalPadding: 0.65em; +@selectionVerticalPadding: 0.8em; @selectionHorizontalPadding: 1.1em; @selectionTextColor: @textColor; @selectionBoxShadow: 0px 0px 0px 1px @borderColor; diff --git a/src/themes/packages/default/views/list.variables b/src/themes/packages/default/views/list.variables index d77dd9bbf..bb97432d4 100755 --- a/src/themes/packages/default/views/list.variables +++ b/src/themes/packages/default/views/list.variables @@ -31,9 +31,10 @@ /* Icon */ @iconDistance: 0.3em; -@iconAlign: middle; @iconOffset: ((@itemLineHeight - 1rem) / 2); @iconTransition: color 0.2s ease; +@iconVerticalAlign: top; +@iconContentVerticalAlign: middle; /* Image */ @imageDistance: 0.5em; @@ -42,7 +43,7 @@ /* Content */ @contentDistance: 0.5em; @contentLineHeight: 1.2em; -@contentAlign: middle; +@contentVerticalAlign: middle; /* Link */ @itemLinkColor: @textColor; @@ -139,7 +140,7 @@ /* Horizontal Bullets */ @horizontalBulletSpacing: 1.5rem; -@horizontalBulletOffset: -0.9rem; +@horizontalBulletOffset: -1.1rem; /* Ordered List */ @orderedCountName: ordered;