diff --git a/gui/css/gui.css b/gui/css/gui.css index 1543816..af67178 100644 --- a/gui/css/gui.css +++ b/gui/css/gui.css @@ -61,8 +61,8 @@ input { } #gui .result .frame { float: left; - width: 200px; - height: 200px; + width: 230px; + height: 230px; position: relative; border: 1px solid #e0e0e0; border-top-color: #dcdcdc; @@ -113,10 +113,9 @@ input { cursor: default; } - #gui .modify { float: right; - width: 480px; + width: 450px; margin-bottom: 18px; } @@ -124,17 +123,17 @@ input { float: left; clear: both; width: 100%; - margin-bottom: 10px; + margin-bottom: 3px; line-height: 20px; } #gui .option label { float: left; - width: 80px; + width: 100px; } #gui .option .slider { float: left; position: relative; - width: 300px; + width: 260px; margin-top: 4px; } #gui .option input.value { diff --git a/gui/index.html b/gui/index.html index d44c3e3..4052f38 100644 --- a/gui/index.html +++ b/gui/index.html @@ -47,7 +47,7 @@

Spinners

- +
@@ -87,14 +87,32 @@

Spinners

-
- +
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ +
+ +
+
@@ -107,7 +125,10 @@

Spinners

opacity: #{opacity}, padding: #{padding}, rotation: #{rotation}, - color: '#{color}' + fadeOutSpeed: #{fadeOutSpeed}, + color: '#{color}', + pauseColor: '#{pauseColor}', + pauseOpacity: #{pauseOpacity} }).play(); spinner.center(); diff --git a/gui/js/gui.js b/gui/js/gui.js index 72cf9e3..f7a1dcb 100644 --- a/gui/js/gui.js +++ b/gui/js/gui.js @@ -59,7 +59,7 @@ $(document).ready(function() { } // colors should start with # - if ($(this).attr('name') == 'color' && $(this).val().substr(0,1) != '#') { + if (($.inArray($(this).attr('name'), ['color','pauseColor']) != -1) && $(this).val().substr(0,1) != '#') { $(this).val('#' + $(this).val()); } @@ -80,7 +80,7 @@ $(document).ready(function() { $(this).addClass('disabled').siblings().removeClass('disabled'); }); - }) + }); // collect the options function getOptions() { @@ -93,6 +93,7 @@ $(document).ready(function() { // add color options.color = $("#gui input[name='color']").val(); + options.pauseColor = $("#gui input[name='pauseColor']").val(); return options; } @@ -126,7 +127,7 @@ $(document).ready(function() { $.each(ho.split('&'), function(i, pair) { var p = pair.split('='), name = p[0], value = p[1]; options[name] = value; - if (name != 'color') options[name] = parseFloat(options[name]); + if (name != 'color' && name != 'pauseColor') options[name] = parseFloat(options[name]); else if (options[name].substr(0,1) != '#') options[name] = '#' + options[name]; }); return options; diff --git a/js/spinners/spinners.js b/js/spinners/spinners.js index 4825bf2..6ed4019 100644 --- a/js/spinners/spinners.js +++ b/js/spinners/spinners.js @@ -55,10 +55,11 @@ var _ = { } }; -function getOpacityArray(dashes) { - var step = 1 / dashes, array = []; - for (var i = 0;i