From f1c92035349aa967a22a9f52fb19a3474a9916e7 Mon Sep 17 00:00:00 2001 From: jlukic Date: Sun, 6 Oct 2013 15:59:54 -0400 Subject: [PATCH] Updates release notes and builds Former-commit-id: 12cee0f65475ec4eefe3b8a92ee0b35df763aec2 Former-commit-id: 6435c34e9b5adab8d02d5232d05b50981d4b1d77 --- RELEASE NOTES.md | 6 +- build/less/collections/form.less | 65 ++++++++++++------- build/less/modules/dropdown.js | 24 +++++-- build/minified/modules/dropdown.js | 24 +++++-- .../packaged/css/semantic.css.REMOVED.git-id | 2 +- .../javascript/semantic.js.REMOVED.git-id | 2 +- build/uncompressed/collections/form.css | 64 +++++++++++------- build/uncompressed/modules/dropdown.js | 24 +++++-- .../files/build/less/collections/form.less | 65 ++++++++++++------- node/src/files/build/less/modules/dropdown.js | 24 +++++-- .../files/build/minified/modules/dropdown.js | 24 +++++-- .../packaged/css/semantic.css.REMOVED.git-id | 2 +- .../javascript/semantic.js.REMOVED.git-id | 2 +- .../build/uncompressed/collections/form.css | 64 +++++++++++------- .../build/uncompressed/modules/dropdown.js | 24 +++++-- 15 files changed, 285 insertions(+), 131 deletions(-) diff --git a/RELEASE NOTES.md b/RELEASE NOTES.md index 865a0d0c3..48ca40f90 100755 --- a/RELEASE NOTES.md +++ b/RELEASE NOTES.md @@ -2,10 +2,14 @@ ### Version 0.3.6 - Oct 2, 2013 -**Updates** +**Docs** +- Updates form and accordion docs +**Updates** +- Dropdown action default is now automatically determined based on type of dropdown, select dropdowns now will update form fields with default options - Adds fluid variation to accordion - Adds more html5 form support for forms (deneuxa) +- Fields can include both field and another level of fields ### Version 0.3.5 - Oct 2, 2013 diff --git a/build/less/collections/form.less b/build/less/collections/form.less index 33ad5d792..834393d68 100644 --- a/build/less/collections/form.less +++ b/build/less/collections/form.less @@ -64,19 +64,25 @@ .ui.form textarea, +.ui.form select, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], .ui.form input[type="password"], +.ui.form input[type="number"], +.ui.form input[type="tel"], .ui.form .ui.input { width: 100%; } .ui.form textarea, +.ui.form select, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], -.ui.form input[type="password"] { +.ui.form input[type="password"], +.ui.form input[type="number"], +.ui.form input[type="tel"]{ margin: 0em; padding: 0.85em 1.2em; @@ -140,9 +146,7 @@ max-height: 24em; resize: vertical; } -.ui.form select { - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); -} + .ui.form textarea, .ui.form input[type="checkbox"] { vertical-align: top; @@ -206,7 +210,10 @@ .ui.form input[type="email"]:focus, .ui.form input[type="date"]:focus, .ui.form input[type="password"]:focus, -.ui.form textarea:focus { +.ui.form input[type="number"]:focus, +.ui.form input[type="tel"]:focus, +.ui.form textarea:focus, +.ui.form select:focus{ color: rgba(0, 0, 0, 0.85); border-color: rgba(0, 0, 0, 0.2); border-bottom-left-radius: 0; @@ -247,11 +254,15 @@ .ui.form .fields.error .field input[type="email"], .ui.form .fields.error .field input[type="date"], .ui.form .fields.error .field input[type="password"], +.ui.form .fields.error .field input[type="number"], +.ui.form .fields.error .field input[type="tel"], .ui.form .field.error textarea, .ui.form .field.error input[type="text"], .ui.form .field.error input[type="email"], .ui.form .field.error input[type="date"], -.ui.form .field.error input[type="password"] { +.ui.form .field.error input[type="password"], +.ui.form .field.error input[type="number"], +.ui.form .field.error input[type="tel"]{ background-color: #FFFAFA; border-color: #E7BEBE; border-left: none; @@ -271,7 +282,9 @@ .ui.form .field.error input[type="text"]:focus, .ui.form .field.error input[type="email"]:focus, .ui.form .field.error input[type="date"]:focus, -.ui.form .field.error input[type="password"]:focus { +.ui.form .field.error input[type="password"]:focus, +.ui.form .field.error input[type="number"]:focus, +.ui.form .field.error input[type="tel"]:focus{ border-color: rgba(255, 80, 80, 1); color: rgba(255, 80, 80, 1); @@ -385,12 +398,11 @@ } .ui.form .date.field > label:after { position: absolute; - top: 1.4em; + top: 2em; right: 0.5em; - font-family: 'Icons'; - content: '📅'; /* '\1f4c5' */ - font-size: 1.5em; + content: '\f133'; + font-size: 1.2em; font-weight: normal; color: #CCCCCC; } @@ -406,7 +418,9 @@ .ui.inverted.form .field.error input[type="text"], .ui.inverted.form .field.error input[type="email"], .ui.inverted.form .field.error input[type="date"], -.ui.inverted.form .field.error input[type="password"]{ +.ui.inverted.form .field.error input[type="password"], +.ui.inverted.form .field.error input[type="number"], +.ui.inverted.form .field.error input[type="tel"]{ background-color: #FFCCCC; } @@ -442,7 +456,7 @@ line-height: 0; height: 0; } -.ui.form .fields .field { +.ui.form .fields > .field { clear: none; float: left; -webkit-box-sizing: border-box; @@ -450,35 +464,37 @@ -ms-box-sizing: border-box; box-sizing: border-box; } -.ui.form .fields .field:first-child { +.ui.form .fields > .field:first-child { border-left: none; box-shadow: none; } /* Other Combinations */ -.ui.form .two.fields .field { +.ui.form .two.fields > .fields, +.ui.form .two.fields > .field { width: 50%; padding-left: 1%; padding-right: 1%; } - -.ui.form .three.fields .field { +.ui.form .three.fields > .fields, +.ui.form .three.fields > .field { width: 33.333%; padding-left: 1%; padding-right: 1%; } -.ui.form .four.fields .field { +.ui.form .four.fields > .fields, +.ui.form .four.fields > .field { width: 25%; padding-left: 1%; padding-right: 1%; } -.ui.form .five.fields .field { +.ui.form .five.fields > .fields, +.ui.form .five.fields > .field { width: 20%; padding-left: 1%; padding-right: 1%; } -/* override sides, ie8 no last-child */ .ui.form .fields .field:first-child { padding-left: 0%; } @@ -498,11 +514,9 @@ .ui.form .inline.fields .field > label, .ui.form .inline.fields .field > p, .ui.form .inline.fields .field > input, -.ui.form .inline.fields .field > select, .ui.form .inline.field > label, .ui.form .inline.field > p, -.ui.form .inline.field > input, -.ui.form .inline.field > select { +.ui.form .inline.field > input { display: inline-block; width: auto; @@ -541,7 +555,10 @@ .ui.small.form input[type="email"], .ui.small.form input[type="date"], .ui.small.form input[type="password"], -.ui.small.form label { +.ui.small.form input[type="number"], +.ui.small.form input[type="tel"], +.ui.small.form label, +.ui.small.form select{ font-size: 1em; } diff --git a/build/less/modules/dropdown.js b/build/less/modules/dropdown.js index 0cbd1ed97..b07169e01 100644 --- a/build/less/modules/dropdown.js +++ b/build/less/modules/dropdown.js @@ -188,12 +188,22 @@ $.fn.dropdown = function(parameters) { determine: { selectAction: function(text, value) { module.verbose('Determining action', settings.action); - if( $.isFunction( module[settings.action] ) ) { - module.verbose('Triggering preset action', settings.action); + if(settings.action == 'auto') { + if(module.is.selection()) { + module.debug('Selection dropdown used updating form', text, value); + module.updateForm(text, value); + } + else { + module.debug('No action specified hiding dropdown', text, value); + module.hide(); + } + } + else if( $.isFunction( module[settings.action] ) ) { + module.verbose('Triggering preset action', settings.action, text, value); module[ settings.action ](text, value); } else if( $.isFunction(settings.action) ) { - module.verbose('Triggering user action', settings.action); + module.verbose('Triggering user action', settings.action, text, value); settings.action(text, value); } else { @@ -318,6 +328,9 @@ $.fn.dropdown = function(parameters) { }, is: { + selection: function() { + return $module.hasClass(className.selection); + }, visible: function($subMenu) { return ($subMenu) ? $subMenu.is(':animated, :visible') @@ -666,7 +679,7 @@ $.fn.dropdown.settings = { performance : true, on : 'click', - action : 'hide', + action : 'auto', delay: { show: 200, @@ -702,7 +715,8 @@ $.fn.dropdown.settings = { active : 'active', placeholder : 'default', disabled : 'disabled', - visible : 'visible' + visible : 'visible', + selection : 'selection' } }; diff --git a/build/minified/modules/dropdown.js b/build/minified/modules/dropdown.js index 0cbd1ed97..b07169e01 100644 --- a/build/minified/modules/dropdown.js +++ b/build/minified/modules/dropdown.js @@ -188,12 +188,22 @@ $.fn.dropdown = function(parameters) { determine: { selectAction: function(text, value) { module.verbose('Determining action', settings.action); - if( $.isFunction( module[settings.action] ) ) { - module.verbose('Triggering preset action', settings.action); + if(settings.action == 'auto') { + if(module.is.selection()) { + module.debug('Selection dropdown used updating form', text, value); + module.updateForm(text, value); + } + else { + module.debug('No action specified hiding dropdown', text, value); + module.hide(); + } + } + else if( $.isFunction( module[settings.action] ) ) { + module.verbose('Triggering preset action', settings.action, text, value); module[ settings.action ](text, value); } else if( $.isFunction(settings.action) ) { - module.verbose('Triggering user action', settings.action); + module.verbose('Triggering user action', settings.action, text, value); settings.action(text, value); } else { @@ -318,6 +328,9 @@ $.fn.dropdown = function(parameters) { }, is: { + selection: function() { + return $module.hasClass(className.selection); + }, visible: function($subMenu) { return ($subMenu) ? $subMenu.is(':animated, :visible') @@ -666,7 +679,7 @@ $.fn.dropdown.settings = { performance : true, on : 'click', - action : 'hide', + action : 'auto', delay: { show: 200, @@ -702,7 +715,8 @@ $.fn.dropdown.settings = { active : 'active', placeholder : 'default', disabled : 'disabled', - visible : 'visible' + visible : 'visible', + selection : 'selection' } }; diff --git a/build/packaged/css/semantic.css.REMOVED.git-id b/build/packaged/css/semantic.css.REMOVED.git-id index 85fe22093..2a3a770db 100644 --- a/build/packaged/css/semantic.css.REMOVED.git-id +++ b/build/packaged/css/semantic.css.REMOVED.git-id @@ -1 +1 @@ -d64e7a84f290a8723ef9688d69163dceb3b7fe22 \ No newline at end of file +225471d9d5792abc159b1dd1e9267dea1697765a \ No newline at end of file diff --git a/build/packaged/javascript/semantic.js.REMOVED.git-id b/build/packaged/javascript/semantic.js.REMOVED.git-id index 09449ea57..1ced2909f 100644 --- a/build/packaged/javascript/semantic.js.REMOVED.git-id +++ b/build/packaged/javascript/semantic.js.REMOVED.git-id @@ -1 +1 @@ -33af0c06b1959e182f70bb914bd5a40dd89a5139 \ No newline at end of file +3bf1efc57909d6063b8fa2ab969e519e312e038e \ No newline at end of file diff --git a/build/uncompressed/collections/form.css b/build/uncompressed/collections/form.css index da3c0e2c0..9f61a5167 100644 --- a/build/uncompressed/collections/form.css +++ b/build/uncompressed/collections/form.css @@ -50,18 +50,24 @@ Standard Inputs ---------------------*/ .ui.form textarea, +.ui.form select, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], .ui.form input[type="password"], +.ui.form input[type="number"], +.ui.form input[type="tel"], .ui.form .ui.input { width: 100%; } .ui.form textarea, +.ui.form select, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], -.ui.form input[type="password"] { +.ui.form input[type="password"], +.ui.form input[type="number"], +.ui.form input[type="tel"] { margin: 0em; padding: 0.85em 1.2em; font-size: 0.875em; @@ -95,9 +101,6 @@ max-height: 24em; resize: vertical; } -.ui.form select { - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); -} .ui.form textarea, .ui.form input[type="checkbox"] { vertical-align: top; @@ -148,7 +151,10 @@ .ui.form input[type="email"]:focus, .ui.form input[type="date"]:focus, .ui.form input[type="password"]:focus, -.ui.form textarea:focus { +.ui.form input[type="number"]:focus, +.ui.form input[type="tel"]:focus, +.ui.form textarea:focus, +.ui.form select:focus { color: rgba(0, 0, 0, 0.85); border-color: rgba(0, 0, 0, 0.2); border-bottom-left-radius: 0; @@ -182,11 +188,15 @@ .ui.form .fields.error .field input[type="email"], .ui.form .fields.error .field input[type="date"], .ui.form .fields.error .field input[type="password"], +.ui.form .fields.error .field input[type="number"], +.ui.form .fields.error .field input[type="tel"], .ui.form .field.error textarea, .ui.form .field.error input[type="text"], .ui.form .field.error input[type="email"], .ui.form .field.error input[type="date"], -.ui.form .field.error input[type="password"] { +.ui.form .field.error input[type="password"], +.ui.form .field.error input[type="number"], +.ui.form .field.error input[type="tel"] { background-color: #FFFAFA; border-color: #E7BEBE; border-left: none; @@ -202,7 +212,9 @@ .ui.form .field.error input[type="text"]:focus, .ui.form .field.error input[type="email"]:focus, .ui.form .field.error input[type="date"]:focus, -.ui.form .field.error input[type="password"]:focus { +.ui.form .field.error input[type="password"]:focus, +.ui.form .field.error input[type="number"]:focus, +.ui.form .field.error input[type="tel"]:focus { border-color: #ff5050; color: #ff5050; -webkit-appearance: none; @@ -296,13 +308,11 @@ } .ui.form .date.field > label:after { position: absolute; - top: 1.4em; + top: 2em; right: 0.5em; font-family: 'Icons'; - content: '📅'; - /* '\1f4c5' */ - - font-size: 1.5em; + content: '\f133'; + font-size: 1.2em; font-weight: normal; color: #CCCCCC; } @@ -316,7 +326,9 @@ .ui.inverted.form .field.error input[type="text"], .ui.inverted.form .field.error input[type="email"], .ui.inverted.form .field.error input[type="date"], -.ui.inverted.form .field.error input[type="password"] { +.ui.inverted.form .field.error input[type="password"], +.ui.inverted.form .field.error input[type="number"], +.ui.inverted.form .field.error input[type="tel"] { background-color: #FFCCCC; } /*-------------------- @@ -347,7 +359,7 @@ line-height: 0; height: 0; } -.ui.form .fields .field { +.ui.form .fields > .field { clear: none; float: left; -webkit-box-sizing: border-box; @@ -355,32 +367,35 @@ -ms-box-sizing: border-box; box-sizing: border-box; } -.ui.form .fields .field:first-child { +.ui.form .fields > .field:first-child { border-left: none; box-shadow: none; } /* Other Combinations */ -.ui.form .two.fields .field { +.ui.form .two.fields > .fields, +.ui.form .two.fields > .field { width: 50%; padding-left: 1%; padding-right: 1%; } -.ui.form .three.fields .field { +.ui.form .three.fields > .fields, +.ui.form .three.fields > .field { width: 33.333%; padding-left: 1%; padding-right: 1%; } -.ui.form .four.fields .field { +.ui.form .four.fields > .fields, +.ui.form .four.fields > .field { width: 25%; padding-left: 1%; padding-right: 1%; } -.ui.form .five.fields .field { +.ui.form .five.fields > .fields, +.ui.form .five.fields > .field { width: 20%; padding-left: 1%; padding-right: 1%; } -/* override sides, ie8 no last-child */ .ui.form .fields .field:first-child { padding-left: 0%; } @@ -397,11 +412,9 @@ .ui.form .inline.fields .field > label, .ui.form .inline.fields .field > p, .ui.form .inline.fields .field > input, -.ui.form .inline.fields .field > select, .ui.form .inline.field > label, .ui.form .inline.field > p, -.ui.form .inline.field > input, -.ui.form .inline.field > select { +.ui.form .inline.field > input { display: inline-block; width: auto; margin-top: 0em; @@ -433,7 +446,10 @@ .ui.small.form input[type="email"], .ui.small.form input[type="date"], .ui.small.form input[type="password"], -.ui.small.form label { +.ui.small.form input[type="number"], +.ui.small.form input[type="tel"], +.ui.small.form label, +.ui.small.form select { font-size: 1em; } /* Large */ diff --git a/build/uncompressed/modules/dropdown.js b/build/uncompressed/modules/dropdown.js index 0cbd1ed97..b07169e01 100644 --- a/build/uncompressed/modules/dropdown.js +++ b/build/uncompressed/modules/dropdown.js @@ -188,12 +188,22 @@ $.fn.dropdown = function(parameters) { determine: { selectAction: function(text, value) { module.verbose('Determining action', settings.action); - if( $.isFunction( module[settings.action] ) ) { - module.verbose('Triggering preset action', settings.action); + if(settings.action == 'auto') { + if(module.is.selection()) { + module.debug('Selection dropdown used updating form', text, value); + module.updateForm(text, value); + } + else { + module.debug('No action specified hiding dropdown', text, value); + module.hide(); + } + } + else if( $.isFunction( module[settings.action] ) ) { + module.verbose('Triggering preset action', settings.action, text, value); module[ settings.action ](text, value); } else if( $.isFunction(settings.action) ) { - module.verbose('Triggering user action', settings.action); + module.verbose('Triggering user action', settings.action, text, value); settings.action(text, value); } else { @@ -318,6 +328,9 @@ $.fn.dropdown = function(parameters) { }, is: { + selection: function() { + return $module.hasClass(className.selection); + }, visible: function($subMenu) { return ($subMenu) ? $subMenu.is(':animated, :visible') @@ -666,7 +679,7 @@ $.fn.dropdown.settings = { performance : true, on : 'click', - action : 'hide', + action : 'auto', delay: { show: 200, @@ -702,7 +715,8 @@ $.fn.dropdown.settings = { active : 'active', placeholder : 'default', disabled : 'disabled', - visible : 'visible' + visible : 'visible', + selection : 'selection' } }; diff --git a/node/src/files/build/less/collections/form.less b/node/src/files/build/less/collections/form.less index 33ad5d792..834393d68 100644 --- a/node/src/files/build/less/collections/form.less +++ b/node/src/files/build/less/collections/form.less @@ -64,19 +64,25 @@ .ui.form textarea, +.ui.form select, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], .ui.form input[type="password"], +.ui.form input[type="number"], +.ui.form input[type="tel"], .ui.form .ui.input { width: 100%; } .ui.form textarea, +.ui.form select, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], -.ui.form input[type="password"] { +.ui.form input[type="password"], +.ui.form input[type="number"], +.ui.form input[type="tel"]{ margin: 0em; padding: 0.85em 1.2em; @@ -140,9 +146,7 @@ max-height: 24em; resize: vertical; } -.ui.form select { - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); -} + .ui.form textarea, .ui.form input[type="checkbox"] { vertical-align: top; @@ -206,7 +210,10 @@ .ui.form input[type="email"]:focus, .ui.form input[type="date"]:focus, .ui.form input[type="password"]:focus, -.ui.form textarea:focus { +.ui.form input[type="number"]:focus, +.ui.form input[type="tel"]:focus, +.ui.form textarea:focus, +.ui.form select:focus{ color: rgba(0, 0, 0, 0.85); border-color: rgba(0, 0, 0, 0.2); border-bottom-left-radius: 0; @@ -247,11 +254,15 @@ .ui.form .fields.error .field input[type="email"], .ui.form .fields.error .field input[type="date"], .ui.form .fields.error .field input[type="password"], +.ui.form .fields.error .field input[type="number"], +.ui.form .fields.error .field input[type="tel"], .ui.form .field.error textarea, .ui.form .field.error input[type="text"], .ui.form .field.error input[type="email"], .ui.form .field.error input[type="date"], -.ui.form .field.error input[type="password"] { +.ui.form .field.error input[type="password"], +.ui.form .field.error input[type="number"], +.ui.form .field.error input[type="tel"]{ background-color: #FFFAFA; border-color: #E7BEBE; border-left: none; @@ -271,7 +282,9 @@ .ui.form .field.error input[type="text"]:focus, .ui.form .field.error input[type="email"]:focus, .ui.form .field.error input[type="date"]:focus, -.ui.form .field.error input[type="password"]:focus { +.ui.form .field.error input[type="password"]:focus, +.ui.form .field.error input[type="number"]:focus, +.ui.form .field.error input[type="tel"]:focus{ border-color: rgba(255, 80, 80, 1); color: rgba(255, 80, 80, 1); @@ -385,12 +398,11 @@ } .ui.form .date.field > label:after { position: absolute; - top: 1.4em; + top: 2em; right: 0.5em; - font-family: 'Icons'; - content: '📅'; /* '\1f4c5' */ - font-size: 1.5em; + content: '\f133'; + font-size: 1.2em; font-weight: normal; color: #CCCCCC; } @@ -406,7 +418,9 @@ .ui.inverted.form .field.error input[type="text"], .ui.inverted.form .field.error input[type="email"], .ui.inverted.form .field.error input[type="date"], -.ui.inverted.form .field.error input[type="password"]{ +.ui.inverted.form .field.error input[type="password"], +.ui.inverted.form .field.error input[type="number"], +.ui.inverted.form .field.error input[type="tel"]{ background-color: #FFCCCC; } @@ -442,7 +456,7 @@ line-height: 0; height: 0; } -.ui.form .fields .field { +.ui.form .fields > .field { clear: none; float: left; -webkit-box-sizing: border-box; @@ -450,35 +464,37 @@ -ms-box-sizing: border-box; box-sizing: border-box; } -.ui.form .fields .field:first-child { +.ui.form .fields > .field:first-child { border-left: none; box-shadow: none; } /* Other Combinations */ -.ui.form .two.fields .field { +.ui.form .two.fields > .fields, +.ui.form .two.fields > .field { width: 50%; padding-left: 1%; padding-right: 1%; } - -.ui.form .three.fields .field { +.ui.form .three.fields > .fields, +.ui.form .three.fields > .field { width: 33.333%; padding-left: 1%; padding-right: 1%; } -.ui.form .four.fields .field { +.ui.form .four.fields > .fields, +.ui.form .four.fields > .field { width: 25%; padding-left: 1%; padding-right: 1%; } -.ui.form .five.fields .field { +.ui.form .five.fields > .fields, +.ui.form .five.fields > .field { width: 20%; padding-left: 1%; padding-right: 1%; } -/* override sides, ie8 no last-child */ .ui.form .fields .field:first-child { padding-left: 0%; } @@ -498,11 +514,9 @@ .ui.form .inline.fields .field > label, .ui.form .inline.fields .field > p, .ui.form .inline.fields .field > input, -.ui.form .inline.fields .field > select, .ui.form .inline.field > label, .ui.form .inline.field > p, -.ui.form .inline.field > input, -.ui.form .inline.field > select { +.ui.form .inline.field > input { display: inline-block; width: auto; @@ -541,7 +555,10 @@ .ui.small.form input[type="email"], .ui.small.form input[type="date"], .ui.small.form input[type="password"], -.ui.small.form label { +.ui.small.form input[type="number"], +.ui.small.form input[type="tel"], +.ui.small.form label, +.ui.small.form select{ font-size: 1em; } diff --git a/node/src/files/build/less/modules/dropdown.js b/node/src/files/build/less/modules/dropdown.js index 0cbd1ed97..b07169e01 100644 --- a/node/src/files/build/less/modules/dropdown.js +++ b/node/src/files/build/less/modules/dropdown.js @@ -188,12 +188,22 @@ $.fn.dropdown = function(parameters) { determine: { selectAction: function(text, value) { module.verbose('Determining action', settings.action); - if( $.isFunction( module[settings.action] ) ) { - module.verbose('Triggering preset action', settings.action); + if(settings.action == 'auto') { + if(module.is.selection()) { + module.debug('Selection dropdown used updating form', text, value); + module.updateForm(text, value); + } + else { + module.debug('No action specified hiding dropdown', text, value); + module.hide(); + } + } + else if( $.isFunction( module[settings.action] ) ) { + module.verbose('Triggering preset action', settings.action, text, value); module[ settings.action ](text, value); } else if( $.isFunction(settings.action) ) { - module.verbose('Triggering user action', settings.action); + module.verbose('Triggering user action', settings.action, text, value); settings.action(text, value); } else { @@ -318,6 +328,9 @@ $.fn.dropdown = function(parameters) { }, is: { + selection: function() { + return $module.hasClass(className.selection); + }, visible: function($subMenu) { return ($subMenu) ? $subMenu.is(':animated, :visible') @@ -666,7 +679,7 @@ $.fn.dropdown.settings = { performance : true, on : 'click', - action : 'hide', + action : 'auto', delay: { show: 200, @@ -702,7 +715,8 @@ $.fn.dropdown.settings = { active : 'active', placeholder : 'default', disabled : 'disabled', - visible : 'visible' + visible : 'visible', + selection : 'selection' } }; diff --git a/node/src/files/build/minified/modules/dropdown.js b/node/src/files/build/minified/modules/dropdown.js index 0cbd1ed97..b07169e01 100644 --- a/node/src/files/build/minified/modules/dropdown.js +++ b/node/src/files/build/minified/modules/dropdown.js @@ -188,12 +188,22 @@ $.fn.dropdown = function(parameters) { determine: { selectAction: function(text, value) { module.verbose('Determining action', settings.action); - if( $.isFunction( module[settings.action] ) ) { - module.verbose('Triggering preset action', settings.action); + if(settings.action == 'auto') { + if(module.is.selection()) { + module.debug('Selection dropdown used updating form', text, value); + module.updateForm(text, value); + } + else { + module.debug('No action specified hiding dropdown', text, value); + module.hide(); + } + } + else if( $.isFunction( module[settings.action] ) ) { + module.verbose('Triggering preset action', settings.action, text, value); module[ settings.action ](text, value); } else if( $.isFunction(settings.action) ) { - module.verbose('Triggering user action', settings.action); + module.verbose('Triggering user action', settings.action, text, value); settings.action(text, value); } else { @@ -318,6 +328,9 @@ $.fn.dropdown = function(parameters) { }, is: { + selection: function() { + return $module.hasClass(className.selection); + }, visible: function($subMenu) { return ($subMenu) ? $subMenu.is(':animated, :visible') @@ -666,7 +679,7 @@ $.fn.dropdown.settings = { performance : true, on : 'click', - action : 'hide', + action : 'auto', delay: { show: 200, @@ -702,7 +715,8 @@ $.fn.dropdown.settings = { active : 'active', placeholder : 'default', disabled : 'disabled', - visible : 'visible' + visible : 'visible', + selection : 'selection' } }; diff --git a/node/src/files/build/packaged/css/semantic.css.REMOVED.git-id b/node/src/files/build/packaged/css/semantic.css.REMOVED.git-id index 85fe22093..2a3a770db 100644 --- a/node/src/files/build/packaged/css/semantic.css.REMOVED.git-id +++ b/node/src/files/build/packaged/css/semantic.css.REMOVED.git-id @@ -1 +1 @@ -d64e7a84f290a8723ef9688d69163dceb3b7fe22 \ No newline at end of file +225471d9d5792abc159b1dd1e9267dea1697765a \ No newline at end of file diff --git a/node/src/files/build/packaged/javascript/semantic.js.REMOVED.git-id b/node/src/files/build/packaged/javascript/semantic.js.REMOVED.git-id index 09449ea57..1ced2909f 100644 --- a/node/src/files/build/packaged/javascript/semantic.js.REMOVED.git-id +++ b/node/src/files/build/packaged/javascript/semantic.js.REMOVED.git-id @@ -1 +1 @@ -33af0c06b1959e182f70bb914bd5a40dd89a5139 \ No newline at end of file +3bf1efc57909d6063b8fa2ab969e519e312e038e \ No newline at end of file diff --git a/node/src/files/build/uncompressed/collections/form.css b/node/src/files/build/uncompressed/collections/form.css index da3c0e2c0..9f61a5167 100644 --- a/node/src/files/build/uncompressed/collections/form.css +++ b/node/src/files/build/uncompressed/collections/form.css @@ -50,18 +50,24 @@ Standard Inputs ---------------------*/ .ui.form textarea, +.ui.form select, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], .ui.form input[type="password"], +.ui.form input[type="number"], +.ui.form input[type="tel"], .ui.form .ui.input { width: 100%; } .ui.form textarea, +.ui.form select, .ui.form input[type="text"], .ui.form input[type="email"], .ui.form input[type="date"], -.ui.form input[type="password"] { +.ui.form input[type="password"], +.ui.form input[type="number"], +.ui.form input[type="tel"] { margin: 0em; padding: 0.85em 1.2em; font-size: 0.875em; @@ -95,9 +101,6 @@ max-height: 24em; resize: vertical; } -.ui.form select { - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); -} .ui.form textarea, .ui.form input[type="checkbox"] { vertical-align: top; @@ -148,7 +151,10 @@ .ui.form input[type="email"]:focus, .ui.form input[type="date"]:focus, .ui.form input[type="password"]:focus, -.ui.form textarea:focus { +.ui.form input[type="number"]:focus, +.ui.form input[type="tel"]:focus, +.ui.form textarea:focus, +.ui.form select:focus { color: rgba(0, 0, 0, 0.85); border-color: rgba(0, 0, 0, 0.2); border-bottom-left-radius: 0; @@ -182,11 +188,15 @@ .ui.form .fields.error .field input[type="email"], .ui.form .fields.error .field input[type="date"], .ui.form .fields.error .field input[type="password"], +.ui.form .fields.error .field input[type="number"], +.ui.form .fields.error .field input[type="tel"], .ui.form .field.error textarea, .ui.form .field.error input[type="text"], .ui.form .field.error input[type="email"], .ui.form .field.error input[type="date"], -.ui.form .field.error input[type="password"] { +.ui.form .field.error input[type="password"], +.ui.form .field.error input[type="number"], +.ui.form .field.error input[type="tel"] { background-color: #FFFAFA; border-color: #E7BEBE; border-left: none; @@ -202,7 +212,9 @@ .ui.form .field.error input[type="text"]:focus, .ui.form .field.error input[type="email"]:focus, .ui.form .field.error input[type="date"]:focus, -.ui.form .field.error input[type="password"]:focus { +.ui.form .field.error input[type="password"]:focus, +.ui.form .field.error input[type="number"]:focus, +.ui.form .field.error input[type="tel"]:focus { border-color: #ff5050; color: #ff5050; -webkit-appearance: none; @@ -296,13 +308,11 @@ } .ui.form .date.field > label:after { position: absolute; - top: 1.4em; + top: 2em; right: 0.5em; font-family: 'Icons'; - content: '📅'; - /* '\1f4c5' */ - - font-size: 1.5em; + content: '\f133'; + font-size: 1.2em; font-weight: normal; color: #CCCCCC; } @@ -316,7 +326,9 @@ .ui.inverted.form .field.error input[type="text"], .ui.inverted.form .field.error input[type="email"], .ui.inverted.form .field.error input[type="date"], -.ui.inverted.form .field.error input[type="password"] { +.ui.inverted.form .field.error input[type="password"], +.ui.inverted.form .field.error input[type="number"], +.ui.inverted.form .field.error input[type="tel"] { background-color: #FFCCCC; } /*-------------------- @@ -347,7 +359,7 @@ line-height: 0; height: 0; } -.ui.form .fields .field { +.ui.form .fields > .field { clear: none; float: left; -webkit-box-sizing: border-box; @@ -355,32 +367,35 @@ -ms-box-sizing: border-box; box-sizing: border-box; } -.ui.form .fields .field:first-child { +.ui.form .fields > .field:first-child { border-left: none; box-shadow: none; } /* Other Combinations */ -.ui.form .two.fields .field { +.ui.form .two.fields > .fields, +.ui.form .two.fields > .field { width: 50%; padding-left: 1%; padding-right: 1%; } -.ui.form .three.fields .field { +.ui.form .three.fields > .fields, +.ui.form .three.fields > .field { width: 33.333%; padding-left: 1%; padding-right: 1%; } -.ui.form .four.fields .field { +.ui.form .four.fields > .fields, +.ui.form .four.fields > .field { width: 25%; padding-left: 1%; padding-right: 1%; } -.ui.form .five.fields .field { +.ui.form .five.fields > .fields, +.ui.form .five.fields > .field { width: 20%; padding-left: 1%; padding-right: 1%; } -/* override sides, ie8 no last-child */ .ui.form .fields .field:first-child { padding-left: 0%; } @@ -397,11 +412,9 @@ .ui.form .inline.fields .field > label, .ui.form .inline.fields .field > p, .ui.form .inline.fields .field > input, -.ui.form .inline.fields .field > select, .ui.form .inline.field > label, .ui.form .inline.field > p, -.ui.form .inline.field > input, -.ui.form .inline.field > select { +.ui.form .inline.field > input { display: inline-block; width: auto; margin-top: 0em; @@ -433,7 +446,10 @@ .ui.small.form input[type="email"], .ui.small.form input[type="date"], .ui.small.form input[type="password"], -.ui.small.form label { +.ui.small.form input[type="number"], +.ui.small.form input[type="tel"], +.ui.small.form label, +.ui.small.form select { font-size: 1em; } /* Large */ diff --git a/node/src/files/build/uncompressed/modules/dropdown.js b/node/src/files/build/uncompressed/modules/dropdown.js index 0cbd1ed97..b07169e01 100644 --- a/node/src/files/build/uncompressed/modules/dropdown.js +++ b/node/src/files/build/uncompressed/modules/dropdown.js @@ -188,12 +188,22 @@ $.fn.dropdown = function(parameters) { determine: { selectAction: function(text, value) { module.verbose('Determining action', settings.action); - if( $.isFunction( module[settings.action] ) ) { - module.verbose('Triggering preset action', settings.action); + if(settings.action == 'auto') { + if(module.is.selection()) { + module.debug('Selection dropdown used updating form', text, value); + module.updateForm(text, value); + } + else { + module.debug('No action specified hiding dropdown', text, value); + module.hide(); + } + } + else if( $.isFunction( module[settings.action] ) ) { + module.verbose('Triggering preset action', settings.action, text, value); module[ settings.action ](text, value); } else if( $.isFunction(settings.action) ) { - module.verbose('Triggering user action', settings.action); + module.verbose('Triggering user action', settings.action, text, value); settings.action(text, value); } else { @@ -318,6 +328,9 @@ $.fn.dropdown = function(parameters) { }, is: { + selection: function() { + return $module.hasClass(className.selection); + }, visible: function($subMenu) { return ($subMenu) ? $subMenu.is(':animated, :visible') @@ -666,7 +679,7 @@ $.fn.dropdown.settings = { performance : true, on : 'click', - action : 'hide', + action : 'auto', delay: { show: 200, @@ -702,7 +715,8 @@ $.fn.dropdown.settings = { active : 'active', placeholder : 'default', disabled : 'disabled', - visible : 'visible' + visible : 'visible', + selection : 'selection' } };