Browse Source

fixes bug in shape module that fucked with queued animations, adds large size to button because why wasnt there one?

pull/13/head
Jack Lukic 12 years ago
parent
commit
62875ee7e2
4 changed files with 20 additions and 10 deletions
  1. 3
      docs/button.html
  2. 2
      docs/form.html
  3. 4
      src/modules/ui/shape.js
  4. 21
      src/ui/flat/button.css

3
docs/button.html

@ -200,6 +200,9 @@
<div class="medium ui button"> <div class="medium ui button">
Medium Medium
</div> </div>
<div class="large ui button">
Large
</div>
<div class="big ui button"> <div class="big ui button">
Big Big
</div> </div>

2
docs/form.html

@ -399,7 +399,7 @@
<input placeholder="Last Name" type="text"> <input placeholder="Last Name" type="text">
</div> </div>
</div> </div>
<div class="ui blue submit button">Submit</div>
<div class="ui blue small submit button">Submit</div>
</div> </div>
<br><br> <br><br>
<div class="ui large form segment"> <div class="ui large form segment">

4
src/modules/ui/shape.js

@ -89,10 +89,11 @@ $.fn.shape = function(parameters) {
animate: function(propertyObject, callback) { animate: function(propertyObject, callback) {
module.verbose('Animating box with properties', propertyObject); module.verbose('Animating box with properties', propertyObject);
callback = callback || function() {
callback = callback || function(event) {
module.reset(); module.reset();
module.set.active(); module.set.active();
$.proxy(settings.onChange, $nextSide)(); $.proxy(settings.onChange, $nextSide)();
event.stopImmediatePropagation();
}; };
if(settings.useCSS) { if(settings.useCSS) {
module.verbose('Starting CSS animation'); module.verbose('Starting CSS animation');
@ -136,6 +137,7 @@ $.fn.shape = function(parameters) {
module.debug('Queueing animation of', method); module.debug('Queueing animation of', method);
$shape $shape
.one(endTransition, function() { .one(endTransition, function() {
module.debug('Executing queued animation');
$module.shape(method); $module.shape(method);
}) })
; ;

21
src/ui/flat/button.css

@ -376,31 +376,36 @@ Red / Negative
.ui.tiny.button { .ui.tiny.button {
font-size: 11px; font-size: 11px;
font-weight: bold; font-weight: bold;
padding: 6px 13px;
padding: 8px 15px;
} }
.ui.small.buttons .button, .ui.small.buttons .button,
.ui.small.button { .ui.small.button {
font-size: 12px; font-size: 12px;
padding: 6px 15px;
padding: 10px 20px;
} }
.ui.medium.buttons .button, .ui.medium.buttons .button,
.ui.medium.button { .ui.medium.button {
font-size: 14px; 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.buttons .button,
.ui.big.button { .ui.big.button {
font-size: 16px;
padding: 13px 30px;
font-size: 18px;
padding: 15px 30px;
} }
.ui.huge.buttons .button, .ui.huge.buttons .button,
.ui.huge.button { .ui.huge.button {
font-size: 18px;
padding: 15px 30px;
font-size: 20px;
padding: 18px 30px;
} }
.ui.massive.buttons .button, .ui.massive.buttons .button,
.ui.massive.button { .ui.massive.button {
padding: 15px 45px;
padding: 20px 45px;
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;

Loading…
Cancel
Save