From 4b7c06e6de84dc2f6f44a664535d5ba659eef5fa Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Tue, 23 Apr 2013 19:21:42 -0400 Subject: [PATCH 1/2] iteration on forms, and overall conformity of docs Former-commit-id: 487b97e4fc755e429ecbad985c5ce4928a8c7b65 Former-commit-id: 3a99691b789836117db8b3964655283e858b51f6 --- docs/button.html | 2 +- docs/form.html | 62 +++++++++++++++++++- docs/javascript/{example.js => semantic.js} | 6 +- docs/javascript/shape.js | 9 +-- docs/module.html | 2 +- docs/shape.html | 2 +- docs/stylesheets/example.css | 12 ++++ src/modules/{ui => behavior}/colorize.js | 0 src/ui/flat/form.css | 53 +++++------------ src/ui/images/throbber-large.gif | Bin 14165 -> 8492 bytes 10 files changed, 98 insertions(+), 50 deletions(-) rename docs/javascript/{example.js => semantic.js} (97%) rename src/modules/{ui => behavior}/colorize.js (100%) diff --git a/docs/button.html b/docs/button.html index 52687b1e9..e21602d76 100755 --- a/docs/button.html +++ b/docs/button.html @@ -24,7 +24,7 @@ - + diff --git a/docs/form.html b/docs/form.html index 343bf8c52..355097ae6 100755 --- a/docs/form.html +++ b/docs/form.html @@ -27,7 +27,7 @@ - + @@ -376,6 +376,8 @@

Variations

+ +

Forms

Size

A form can also be small or large

@@ -421,6 +423,33 @@
Submit
+

Inverted

+

A form on a dark background may have to invert its color scheme

+ +
+
+
+
We had some issues
+
    +
  • Please enter your first name
  • +
  • Please enter your last name
  • +
+
+
+
+ + +
+
+ + +
+
+
Submit
+
+
+ +

Fields

Inline

@@ -434,6 +463,37 @@ +

Date

+

A field can let users know they are for dates

+
+
+ + +
+
+ + +

Groups

+ +

Field Groups

+

Fields can exist side by side on groups

+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ diff --git a/docs/javascript/example.js b/docs/javascript/semantic.js similarity index 97% rename from docs/javascript/example.js rename to docs/javascript/semantic.js index 41bc385a7..6c5bc2322 100755 --- a/docs/javascript/example.js +++ b/docs/javascript/semantic.js @@ -1,10 +1,10 @@ // namespace -var shape = { +var semantic = { handler: {} }; // ready event -shape.ready = function() { +semantic.ready = function() { // selector cache var @@ -140,5 +140,5 @@ shape.ready = function() { // attach ready event $(document) - .ready(shape.ready) + .ready(semantic.ready) ; \ No newline at end of file diff --git a/docs/javascript/shape.js b/docs/javascript/shape.js index 5b63f7c35..81cae4d58 100755 --- a/docs/javascript/shape.js +++ b/docs/javascript/shape.js @@ -1,10 +1,7 @@ -// namespace -var shape = { - handler: {} -}; +semantic.shape = {}; // ready event -shape.ready = function() { +semantic.shape.ready = function() { // selector cache var @@ -78,5 +75,5 @@ shape.ready = function() { // attach ready event $(document) - .ready(shape.ready) + .ready(semantic.shape.ready) ; \ No newline at end of file diff --git a/docs/module.html b/docs/module.html index 479187c06..287a75409 100755 --- a/docs/module.html +++ b/docs/module.html @@ -21,7 +21,7 @@ - + diff --git a/docs/shape.html b/docs/shape.html index bddd546ad..fdc21e344 100755 --- a/docs/shape.html +++ b/docs/shape.html @@ -24,7 +24,7 @@ - + diff --git a/docs/stylesheets/example.css b/docs/stylesheets/example.css index 0e6211278..ab61d6a42 100755 --- a/docs/stylesheets/example.css +++ b/docs/stylesheets/example.css @@ -212,6 +212,18 @@ a:hover { left: -230px; width: 180px; } +#example .peek .panel :nth-child(1) { + border-left-color: #00B9F0; +} +#example .peek .panel :nth-child(2) { + border-left-color: #56BB73; +} +#example .peek .panel :nth-child(3) { + border-left-color: #EF3F49; +} +#example .peek .panel :nth-child(4) { + border-left-color: #A24096; +} #example .peek .panel { width: 180px; } diff --git a/src/modules/ui/colorize.js b/src/modules/behavior/colorize.js similarity index 100% rename from src/modules/ui/colorize.js rename to src/modules/behavior/colorize.js diff --git a/src/ui/flat/form.css b/src/ui/flat/form.css index a94b231d2..051427260 100755 --- a/src/ui/flat/form.css +++ b/src/ui/flat/form.css @@ -63,15 +63,17 @@ .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: 0.5em 0.7em; + padding: 0.53em 0.7em; font-size: 0.825em; background-color: #FFFFFF; border: 1px solid rgba(0, 0, 0, 0.15); + outline: none; color: #555555; @@ -167,9 +169,11 @@ } .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: rgba(255, 80, 80, 0.7); @@ -187,10 +191,10 @@ /* browsers require these rules separate */ .ui.form ::-webkit-input-placeholder { - color: #CCCCCC; + color: #E0E0E0; } .ui.form ::-moz-placeholder { - color: #CCCCCC; + color: #E0E0E0; } .ui.form :focus::-webkit-input-placeholder { color: #AAAAAA; @@ -200,7 +204,7 @@ } .ui.form textarea.empty, .ui.form input.empty { - color: #CCCCCC; + color: #E0E0E0; } /* Error Placeholder */ @@ -285,47 +289,26 @@ } .ui.form .date.field > label:after { position: absolute; - top: 22px; - right: 10px; + top: 1.2em; + right: 0.4em; font-family: 'Icons'; content: '📅'; /* '\1f4c5' */ - font-size: 20px; + font-size: 1.5em; font-weight: normal; color: #CCCCCC; } -.ui.large.form .date.field > label:after { - top: 29px; - font-size: 24px; -} /*-------------------- - Higher Contrast + Inverted Colors ---------------------*/ -.ui.contrasting.form label { +.ui.inverted.form label { color: #FFFFFF; } -.ui.contrasting.form .field.error textarea, -.ui.contrasting.form .field.error input[type="text"] { - background-color: #FFAAAA; - border-color: #FF3333; - color: #AA5555; -} -.ui.contrasting.form .field.error label { - color: #FF3333; -} -.ui.contrasting.form .notices, -.ui.contrasting.form .errors { - border-color: #FF3333; - background-image: -webkit-linear-gradient(top , #F36666 0px, #E14242 100%); - background-image: -moz-linear-gradient(top , #F36666 0px, #E14242 100%); - background-image: -o-linear-gradient(top , #F36666 0px, #E14242 100%); - background-image: -ms-linear-gradient(top , #F36666 0px, #E14242 100%); - background-image: linear-gradient(top , #F36666 0px, #E14242 100%); - - color: #FFFFFF; - text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); +.ui.inverted.form .field.error textarea, +.ui.inverted.form .field.error input[type="text"] { + background-color: #FFCCCC; } /*-------------------- @@ -443,7 +426,3 @@ font-weight: bold; } - -/*-------------------- - Error Messages ----------------------*/ diff --git a/src/ui/images/throbber-large.gif b/src/ui/images/throbber-large.gif index 965fcbcd8891bcc87d6f02d91ee6b7c54467049b..519621ccde30027bee14c18a2c552def9f39f9e7 100755 GIT binary patch literal 8492 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 From 8c1a03ba514c9d6f824e09ab5f2bc3260d67e0d4 Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Tue, 23 Apr 2013 19:40:39 -0400 Subject: [PATCH 2/2] fixes bug in shape module that fucked with queued animations, adds large size to button because why wasnt there one? Former-commit-id: 62875ee7e2ccce59f79a3d67b104807b301c1960 Former-commit-id: 69339eb26267fc5e3d0fc377d1fcb472c5624ce0 --- docs/button.html | 3 +++ docs/form.html | 2 +- src/modules/ui/shape.js | 4 +++- src/ui/flat/button.css | 21 +++++++++++++-------- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/docs/button.html b/docs/button.html index e21602d76..45fa755e9 100755 --- a/docs/button.html +++ b/docs/button.html @@ -200,6 +200,9 @@
Medium
+
+ Large +
Big
diff --git a/docs/form.html b/docs/form.html index 355097ae6..083352480 100755 --- a/docs/form.html +++ b/docs/form.html @@ -399,7 +399,7 @@ -
Submit
+
Submit


diff --git a/src/modules/ui/shape.js b/src/modules/ui/shape.js index bd62597a5..c38971f35 100755 --- a/src/modules/ui/shape.js +++ b/src/modules/ui/shape.js @@ -89,10 +89,11 @@ $.fn.shape = function(parameters) { animate: function(propertyObject, callback) { module.verbose('Animating box with properties', propertyObject); - callback = callback || function() { + callback = callback || function(event) { module.reset(); module.set.active(); $.proxy(settings.onChange, $nextSide)(); + event.stopImmediatePropagation(); }; if(settings.useCSS) { module.verbose('Starting CSS animation'); @@ -136,6 +137,7 @@ $.fn.shape = function(parameters) { module.debug('Queueing animation of', method); $shape .one(endTransition, function() { + module.debug('Executing queued animation'); $module.shape(method); }) ; diff --git a/src/ui/flat/button.css b/src/ui/flat/button.css index 2d780b980..061ee6d4a 100755 --- a/src/ui/flat/button.css +++ b/src/ui/flat/button.css @@ -376,31 +376,36 @@ Red / Negative .ui.tiny.button { font-size: 11px; font-weight: bold; - padding: 6px 13px; + padding: 8px 15px; } .ui.small.buttons .button, .ui.small.button { font-size: 12px; - padding: 6px 15px; + padding: 10px 20px; } .ui.medium.buttons .button, .ui.medium.button { font-size: 14px; - padding: 7px 20px; + padding: 12px 30px; +} +.ui.large.buttons .button, +.ui.large.button { + font-size: 16px; + padding: 15px 30px; } .ui.big.buttons .button, .ui.big.button { - font-size: 16px; - padding: 13px 30px; + font-size: 18px; + padding: 15px 30px; } .ui.huge.buttons .button, .ui.huge.button { - font-size: 18px; - padding: 15px 30px; + font-size: 20px; + padding: 18px 30px; } .ui.massive.buttons .button, .ui.massive.button { - padding: 15px 45px; + padding: 20px 45px; font-size: 24px; font-weight: bold;