diff options
| author | Jules <jules@asdf.us> | 2014-02-02 01:18:37 -0500 |
|---|---|---|
| committer | Jules <jules@asdf.us> | 2014-02-02 01:18:37 -0500 |
| commit | 76a4f773a56eaf59953f2f7ebe027d8b0a4b3ee7 (patch) | |
| tree | 054e1a7864ae3e87088f11013d311b06de7e5435 /shader-picker.html | |
| parent | b601a81793ebaec5c6d05e0b6e3e14916bfc3bca (diff) | |
| parent | 4e05e159ec5a9c32366884fecbb7368a8b6f9836 (diff) | |
Merge branch 'master' of lmno:dither
Conflicts:
dist/app.css
dist/app.min.js
dist/index.html
Diffstat (limited to 'shader-picker.html')
| -rw-r--r-- | shader-picker.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/shader-picker.html b/shader-picker.html index 7efe39f..8bafc60 100644 --- a/shader-picker.html +++ b/shader-picker.html @@ -21,10 +21,10 @@ div { display: inline-block; padding: 10px;} #rendered img { display: block; } #render,#save { font-weight: bold; } #render { float: right; } -#instructions { position: absolute;top:20px;right:20px; width:190px;height:465px; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; } -#instructions iframe {width: 100%;height:100%;margin:0;padding:0;border:0;} -#instructions.dragging iframe { pointer-events: none; } -#instructions .close { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; } +#commands { position: absolute;top:20px;right:20px; width:190px;height:465px; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; } +#commands iframe {width: 100%;height:100%;margin:0;padding:0;border:0;} +#commands.dragging iframe { pointer-events: none; } +#commands .close { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; } .close,.remove { cursor: pointer; } #uploaded-url { display: none; width: 300px; } form { display: inline-block; } @@ -79,7 +79,7 @@ a { color: #00f; } your name here → <input type="text" id="username" value=""> <br> <br> - <button id="help">help</button> + <button id="show-commands">help</button> <button id="add-shader">+</button> <button id="remove-shader">×</button> @@ -103,7 +103,7 @@ a { color: #00f; } <input type="text" id="uploaded-url"> </div> -<div id="instructions"><iframe src="instructions.html"></iframe><button class="close">×</button></div> +<div id="commands"><iframe src="commands.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> |