diff options
| -rw-r--r-- | js/user.js | 2 | ||||
| -rw-r--r-- | shader-picker.html | 11 |
2 files changed, 8 insertions, 5 deletions
@@ -128,7 +128,9 @@ user.shaders.save = function(){ $(".active").removeClass("active") $(user.shaders.buttons[name]).addClass("active") + user.shaders.setLastAccessed(name) } + user.shaders.remove = function(){ var name = user.shaders.name if (! name || ! name.length) return diff --git a/shader-picker.html b/shader-picker.html index 368608c..27f537d 100644 --- a/shader-picker.html +++ b/shader-picker.html @@ -8,7 +8,7 @@ html,body { margin: 0; padding: 0; } #width,#height,#framecount,#framedelay,#frameinterval,#background { width: 30px; } #shader { width: 100%; height: 247px; font-family: fixed; } #controls { width: 450px; } -#frames { width: 435px; min-height: 100px; max-height: 150px; overflow: auto; border: 1px solid #ddd; line-height: 0; } +#frames { width: 435px; max-height: 150px; overflow: auto; border: 1px solid #ddd; line-height: 0; } #frames div { margin: 1px; padding: 0; position: relative; border: 1px solid #eee; cursor: -webkit-grab; } .dragging { cursor: -webkit-grabbing !important; } .ui-sortable-helper { cursor: -webkit-grabbing !important; } @@ -80,10 +80,11 @@ a { color: #00f; } <br> <br> <button id="help">help</button> - <button id="test-js">test js</button> - <span id="shaders"></span> + <button id="add-shader">+</button> - <button id="remove-shader">x</button> + <button id="remove-shader">×</button> + + <span id="shaders"></span> <br> <br> <a href="http://asdf.us/im/gallery/?tag=shader" target="_blank">Photoblaster Gallery</a> @@ -102,7 +103,7 @@ a { color: #00f; } <input type="text" id="uploaded-url"> </div> -<div id="instructions"><iframe src="instructions.html"></iframe><button class="close">x</button></div> +<div id="instructions"><iframe src="instructions.html"></iframe><button class="close">×</button></div> </body> <script type="text/javascript" src="js/vendor/gif-encode/util.js"></script> <script type="text/javascript" src="js/vendor/gif-encode/tube.js"></script> |