diff options
| author | Jules <jules@asdf.us> | 2014-02-04 12:08:19 -0500 |
|---|---|---|
| committer | Jules <jules@asdf.us> | 2014-02-04 12:08:19 -0500 |
| commit | c563bfa3df10aac45e0f121f4977c5e8484cc525 (patch) | |
| tree | 66da4b5ea1376b585338b45f80e5cd6e2e3ed870 | |
| parent | 536e76601b10fbf1e03d994750e045b08922555a (diff) | |
copy
| -rw-r--r-- | shader-combo.html | 2 | ||||
| -rw-r--r-- | tutorial.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/shader-combo.html b/shader-combo.html index 7952ade..8eda2c0 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -30,7 +30,7 @@ a { color: #00f; } .ui-sortable-helper { cursor: -webkit-grabbing !important; } #commands { top:40px;right:20px; width:190px;height:calc(95% - 230px); } -#tutorial { top:40px;right:30px; width:290px;height:325px; display: block;} +#tutorial { top:40px;right:30px; width:290px;height:360px; display: block;} .iframe { position: absolute; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; } .iframe iframe {width: 100%;height:100%;margin:0;padding:0;border:0;} .iframe.dragging iframe { pointer-events: none; } diff --git a/tutorial.html b/tutorial.html index 7ea652b..ba6d216 100644 --- a/tutorial.html +++ b/tutorial.html @@ -3,7 +3,7 @@ <head> <title>tutorial</title> <style type="text/css"> -html,body{margin:0;padding:5px 5px 5px 5px; } +html,body{margin:0;padding:0; padding: 5px;} article { font-family: serif; font-size: 14px; margin:0;padding:0;} u{ color: #866; } i{ color: #666; } @@ -18,7 +18,7 @@ time (t), and color (r, g, b, a). Many math functions such as <i>cos</i> and <i>sqrt</i> are available, along with functions from GLSL like <i>step</i> and <i>mix</i>. You can see a full list by clicking "commands" above. -Use the bar below to search <a href="http://dump.fm/">Dumpfm</a> and <a href="http://asdf.us/im/">Photoblaster</a> for images. +Click "images" below to search <a href="http://dump.fm/">Dumpfm</a> and <a href="http://asdf.us/im/">Photoblaster</a> for images, or enter a URL at top left. If you make a cool effect, you can render it out to a gif, or save the shader for others to use. </article> |