From 24fbf83a2c25ed971c0dde524764c6b483b96f17 Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Tue, 28 May 2013 09:16:00 -0400 Subject: [PATCH] update to inline fields Former-commit-id: 6328f11b2e88a9abc822acb2618aaf83d0af1075 Former-commit-id: cb286d5e1492b46275d98e7859366aa27d2b0e4e --- build/minified/collections/form.min.css | 2 +- .../packaged/semantic.min.css.REMOVED.git-id | 2 +- build/uncompressed/collections/form.css | 4 +- node/src/documents/collections/form.html | 64 ++++++++++--------- .../components/semantic/collections/form.css | 4 +- src/collections/form.less | 4 +- 6 files changed, 45 insertions(+), 35 deletions(-) diff --git a/build/minified/collections/form.min.css b/build/minified/collections/form.min.css index 64b6cc8e9..400ac8e50 100644 --- a/build/minified/collections/form.min.css +++ b/build/minified/collections/form.min.css @@ -1 +1 @@ -.ui.form{position:relative;max-width:100%}.ui.form :first-child{margin-top:0}.ui.form>p{margin:1em 0}.ui.form .field{clear:both;margin:0 0 1em}.ui.form .field>label{margin:0 0 .3em;display:block;color:#555;font-size:.875em;line-height:1.2}.ui.form textarea,.ui.form input[type=text],.ui.form input[type=date],.ui.form input[type=password],.ui.textarea,.ui.input{width:100%;padding:.9em 1.2em;font-size:.825em;background-color:#FFF;border:1px solid rgba(0,0,0,.15);outline:0;color:#555;-webkit-border-radius:.3125em;-moz-border-radius:.3125em;border-radius:.3125em;-webkit-transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;-moz-transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;-o-transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;-ms-transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;-webkit-box-shadow:0 rgba(0,0,0,.3) inset;-moz-box-shadow:0 rgba(0,0,0,.3) inset;box-shadow:0 rgba(0,0,0,.3) inset;-webkit-tap-highlight-color:rgba(255,255,255,0);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui.textarea,.ui.form textarea{line-height:1.33;min-height:8em;height:12em;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}.ui.form .divider{clear:both;margin:1em 0}.ui.form .info.message,.ui.form .warning.message,.ui.form .error.message{display:none}.ui.form .message:first-child{margin-top:0}.ui.input:focus,.ui.form input:focus,.ui.form textarea:focus{color:rgba(20,20,20,.9);border-color:rgba(0,0,0,.5);border-bottom-left-radius:0;border-top-left-radius:0;-webkit-box-shadow:.3em 0 0 0 rgba(0,0,0,.5) inset;-moz-box-shadow:.3em 0 0 0 rgba(0,0,0,.5) inset;box-shadow:.3em 0 0 0 rgba(0,0,0,.5) inset}.ui.form.warning .warning.message{display:block}.ui.form.error .error.message{display:block}.ui.form .fields.error .field label,.ui.form .field.error label{color:#EF4D6D}.ui.form .fields.error .field textarea,.ui.form .fields.error .field input[type=text],.ui.form .fields.error .field input[type=date],.ui.form .fields.error .field input[type=password],.ui.form .field.error textarea,.ui.form .field.error input[type=text],.ui.form .field.error input[type=date],.ui.form .field.error input[type=password]{background-color:#FFFAFA;border-color:#E7BEBE;border-left:0;color:#EF4D6D;padding-left:1.2em;border-bottom-left-radius:0;border-top-left-radius:0;-webkit-box-shadow:.3em 0 0 0 #EF4D6D inset;-moz-box-shadow:.3em 0 0 0 #EF4D6D inset;box-shadow:.3em 0 0 0 #EF4D6D inset}.ui.form .field.error textarea:focus,.ui.form .field.error input:focus{border-color:#ff5050;color:#ff5050;-webkit-box-shadow:.3em 0 0 0 #FF5050 inset;-moz-box-shadow:.3em 0 0 0 #FF5050 inset;box-shadow:.3em 0 0 0 #FF5050 inset}.ui.form ::-webkit-input-placeholder{color:#E0E0E0}.ui.form ::-moz-placeholder{color:#E0E0E0}.ui.form :focus::-webkit-input-placeholder{color:#AAA}.ui.form :focus::-moz-placeholder{color:#AAA}.ui.form textarea.empty,.ui.form input.empty{color:#E0E0E0}.ui.form .error ::-webkit-input-placeholder{color:rgba(255,80,80,.4)}.ui.form .error ::-moz-placeholder{color:rgba(255,80,80,.4)}.ui.form .error :focus::-webkit-input-placeholder{color:rgba(255,80,80,.7)}.ui.form .error :focus::-moz-placeholder{color:rgba(255,80,80,.7)}.ui.form .field :disabled,.ui.form .field.disabled{opacity:.5}.ui.form .field.disabled label{opacity:.5}.ui.form .field.disabled :disabled{opacity:1}.ui.form.loading{position:relative}.ui.form.loading:after{position:absolute;top:0;left:0;content:'';width:100%;height:100%;background:rgba(255,255,255,.8) url(../images/throbber-large.gif) no-repeat 50% 50%;visibility:visible}.ui.form.fluid{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui.form input.attached{width:auto}.ui.form .date.field>label{position:relative}.ui.form .date.field>label:after{position:absolute;top:1.4em;right:.5em;font-family:Icons;content:'📅';font-size:1.5em;font-weight:400;color:#CCC}.ui.inverted.form label{color:#FFF}.ui.inverted.form .field.error textarea,.ui.inverted.form .field.error input[type=text]{background-color:#FCC}.ui.form .fields{clear:both}.ui.form .fields:after{content:' ';display:block;clear:both;visibility:hidden;line-height:0;height:0}.ui.form .fields .field{clear:none;float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui.form .fields .field:first-child{border-left:0;box-shadow:none}.ui.form .fields .field,.ui.form .two.fields .field{width:50%;padding-left:1%;padding-right:1%}.ui.form .three.fields .field{width:33.333%;padding-left:1%;padding-right:1%}.ui.form .four.fields .field{width:25%;padding-left:1%;padding-right:1%}.ui.form .five.fields .field{width:20%;padding-left:1%;padding-right:1%}.ui.form .fields .field:first-child{padding-left:0}.ui.form .fields .field:last-child{padding-right:0}.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{display:inline-block;width:auto;margin-top:0;margin-bottom:0;vertical-align:middle;font-size:1em}.ui.form .inline.fields .field>input,.ui.form .inline.field>input{font-size:.875em}.ui.form .inline.fields .field>:first-child,.ui.form .inline.field>:first-child{margin:0 .5em 0 0}.ui.small.form{font-size:.875em}.ui.small.form textarea,.ui.small.form input[type=text],.ui.small.form input[type=password],.ui.small.form label{font-size:1em}.ui.large.form{font-size:1.125em} \ No newline at end of file +.ui.form{position:relative;max-width:100%}.ui.form :first-child{margin-top:0}.ui.form>p{margin:1em 0}.ui.form .field{clear:both;margin:0 0 1em}.ui.form .field>label{margin:0 0 .3em;display:block;color:#555;font-size:.875em;line-height:1.2}.ui.form textarea,.ui.form input[type=text],.ui.form input[type=date],.ui.form input[type=password],.ui.textarea,.ui.input{width:100%;padding:.9em 1.2em;font-size:.825em;background-color:#FFF;border:1px solid rgba(0,0,0,.15);outline:0;color:#555;-webkit-border-radius:.3125em;-moz-border-radius:.3125em;border-radius:.3125em;-webkit-transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;-moz-transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;-o-transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;-ms-transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;transition:background-color .3s ease-out,box-shadow .2s ease,border-color .2s ease;-webkit-box-shadow:0 rgba(0,0,0,.3) inset;-moz-box-shadow:0 rgba(0,0,0,.3) inset;box-shadow:0 rgba(0,0,0,.3) inset;-webkit-tap-highlight-color:rgba(255,255,255,0);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui.textarea,.ui.form textarea{line-height:1.33;min-height:8em;height:12em;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}.ui.form .divider{clear:both;margin:1em 0}.ui.form .info.message,.ui.form .warning.message,.ui.form .error.message{display:none}.ui.form .message:first-child{margin-top:0}.ui.input:focus,.ui.form input:focus,.ui.form textarea:focus{color:rgba(20,20,20,.9);border-color:rgba(0,0,0,.5);border-bottom-left-radius:0;border-top-left-radius:0;-webkit-box-shadow:.3em 0 0 0 rgba(0,0,0,.5) inset;-moz-box-shadow:.3em 0 0 0 rgba(0,0,0,.5) inset;box-shadow:.3em 0 0 0 rgba(0,0,0,.5) inset}.ui.form.warning .warning.message{display:block}.ui.form.error .error.message{display:block}.ui.form .fields.error .field label,.ui.form .field.error label{color:#EF4D6D}.ui.form .fields.error .field textarea,.ui.form .fields.error .field input[type=text],.ui.form .fields.error .field input[type=date],.ui.form .fields.error .field input[type=password],.ui.form .field.error textarea,.ui.form .field.error input[type=text],.ui.form .field.error input[type=date],.ui.form .field.error input[type=password]{background-color:#FFFAFA;border-color:#E7BEBE;border-left:0;color:#EF4D6D;padding-left:1.2em;border-bottom-left-radius:0;border-top-left-radius:0;-webkit-box-shadow:.3em 0 0 0 #EF4D6D inset;-moz-box-shadow:.3em 0 0 0 #EF4D6D inset;box-shadow:.3em 0 0 0 #EF4D6D inset}.ui.form .field.error textarea:focus,.ui.form .field.error input:focus{border-color:#ff5050;color:#ff5050;-webkit-box-shadow:.3em 0 0 0 #FF5050 inset;-moz-box-shadow:.3em 0 0 0 #FF5050 inset;box-shadow:.3em 0 0 0 #FF5050 inset}.ui.form ::-webkit-input-placeholder{color:#E0E0E0}.ui.form ::-moz-placeholder{color:#E0E0E0}.ui.form :focus::-webkit-input-placeholder{color:#AAA}.ui.form :focus::-moz-placeholder{color:#AAA}.ui.form textarea.empty,.ui.form input.empty{color:#E0E0E0}.ui.form .error ::-webkit-input-placeholder{color:rgba(255,80,80,.4)}.ui.form .error ::-moz-placeholder{color:rgba(255,80,80,.4)}.ui.form .error :focus::-webkit-input-placeholder{color:rgba(255,80,80,.7)}.ui.form .error :focus::-moz-placeholder{color:rgba(255,80,80,.7)}.ui.form .field :disabled,.ui.form .field.disabled{opacity:.5}.ui.form .field.disabled label{opacity:.5}.ui.form .field.disabled :disabled{opacity:1}.ui.form.loading{position:relative}.ui.form.loading:after{position:absolute;top:0;left:0;content:'';width:100%;height:100%;background:rgba(255,255,255,.8) url(../images/throbber-large.gif) no-repeat 50% 50%;visibility:visible}.ui.form.fluid{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui.form input.attached{width:auto}.ui.form .date.field>label{position:relative}.ui.form .date.field>label:after{position:absolute;top:1.4em;right:.5em;font-family:Icons;content:'📅';font-size:1.5em;font-weight:400;color:#CCC}.ui.inverted.form label{color:#FFF}.ui.inverted.form .field.error textarea,.ui.inverted.form .field.error input[type=text]{background-color:#FCC}.ui.form .fields{clear:both}.ui.form .fields:after{content:' ';display:block;clear:both;visibility:hidden;line-height:0;height:0}.ui.form .fields .field{clear:none;float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui.form .fields .field:first-child{border-left:0;box-shadow:none}.ui.form .two.fields .field{width:50%;padding-left:1%;padding-right:1%}.ui.form .three.fields .field{width:33.333%;padding-left:1%;padding-right:1%}.ui.form .four.fields .field{width:25%;padding-left:1%;padding-right:1%}.ui.form .five.fields .field{width:20%;padding-left:1%;padding-right:1%}.ui.form .fields .field:first-child{padding-left:0}.ui.form .fields .field:last-child{padding-right:0}.ui.form .inline.fields .field{margin-right:1.5em}.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{display:inline-block;width:auto;margin-top:0;margin-bottom:0;vertical-align:middle;font-size:1em}.ui.form .inline.fields .field>input,.ui.form .inline.field>input{font-size:.875em}.ui.form .inline.fields .field>:first-child,.ui.form .inline.field>:first-child{margin:0 .5em 0 0}.ui.small.form{font-size:.875em}.ui.small.form textarea,.ui.small.form input[type=text],.ui.small.form input[type=password],.ui.small.form label{font-size:1em}.ui.large.form{font-size:1.125em} \ No newline at end of file diff --git a/build/packaged/semantic.min.css.REMOVED.git-id b/build/packaged/semantic.min.css.REMOVED.git-id index f62e24129..d0d7e78d3 100644 --- a/build/packaged/semantic.min.css.REMOVED.git-id +++ b/build/packaged/semantic.min.css.REMOVED.git-id @@ -1 +1 @@ -28d29d4f1ab08e44a533a3d4a4fb46667e5a5eab \ No newline at end of file +c2cc09fda7af25b2ac2972b6d855ae43b108f345 \ No newline at end of file diff --git a/build/uncompressed/collections/form.css b/build/uncompressed/collections/form.css index bf7e5fa3b..eb43680b0 100644 --- a/build/uncompressed/collections/form.css +++ b/build/uncompressed/collections/form.css @@ -313,7 +313,6 @@ box-shadow: none; } /* Other Combinations */ -.ui.form .fields .field, .ui.form .two.fields .field { width: 50%; padding-left: 1%; @@ -344,6 +343,9 @@ /*-------------------- Inline Fields ---------------------*/ +.ui.form .inline.fields .field { + margin-right: 1.5em; +} .ui.form .inline.fields .field > label, .ui.form .inline.fields .field > p, .ui.form .inline.fields .field > input, diff --git a/node/src/documents/collections/form.html b/node/src/documents/collections/form.html index 599998b3c..d03c6975f 100755 --- a/node/src/documents/collections/form.html +++ b/node/src/documents/collections/form.html @@ -5,6 +5,8 @@ css : 'form' title : 'Form' type : 'UI Collection' --- + +

Form

@@ -116,42 +118,44 @@ type : 'UI Collection'

Radio Box

Radio boxes are styled forms of standard form radio controls.

-
-
- - +
+
+
+ + +
+
- -
-
-
- - +
+
+ + +
+
- -
-
-
- - +
+
+ + +
+
- -
-
-
- - +
+
+ + +
+
- -
-
-
- - +
+
+ + +
+
-
-
+
diff --git a/node/src/files/components/semantic/collections/form.css b/node/src/files/components/semantic/collections/form.css index bf7e5fa3b..eb43680b0 100644 --- a/node/src/files/components/semantic/collections/form.css +++ b/node/src/files/components/semantic/collections/form.css @@ -313,7 +313,6 @@ box-shadow: none; } /* Other Combinations */ -.ui.form .fields .field, .ui.form .two.fields .field { width: 50%; padding-left: 1%; @@ -344,6 +343,9 @@ /*-------------------- Inline Fields ---------------------*/ +.ui.form .inline.fields .field { + margin-right: 1.5em; +} .ui.form .inline.fields .field > label, .ui.form .inline.fields .field > p, .ui.form .inline.fields .field > input, diff --git a/src/collections/form.less b/src/collections/form.less index 3444b2234..0a60d74cb 100755 --- a/src/collections/form.less +++ b/src/collections/form.less @@ -400,7 +400,6 @@ } /* Other Combinations */ -.ui.form .fields .field, .ui.form .two.fields .field { width: 50%; padding-left: 1%; @@ -436,6 +435,9 @@ Inline Fields ---------------------*/ +.ui.form .inline.fields .field { + margin-right: 1.5em; +} .ui.form .inline.fields .field > label, .ui.form .inline.fields .field > p, .ui.form .inline.fields .field > input,