summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/api/get.js2
-rw-r--r--shader-combo.html10
2 files changed, 10 insertions, 2 deletions
diff --git a/js/api/get.js b/js/api/get.js
index ae06dbd..742d41f 100644
--- a/js/api/get.js
+++ b/js/api/get.js
@@ -1,5 +1,5 @@
;var ShaderAPI = {}
-ShaderAPI.limit = 24
+ShaderAPI.limit = 50
// info - fetch a single shader
// id: shader id
diff --git a/shader-combo.html b/shader-combo.html
index 399d2e7..60dc72a 100644
--- a/shader-combo.html
+++ b/shader-combo.html
@@ -57,13 +57,13 @@ a { color: #00f; }
#logo { display: inline; position: relative; top: 2px; font-size: 18px; font-family: georgia; font-weight: bold; font-style: italic; margin: 0px; color: #243; }
#corner { position: fixed; top: -5px; right: 0px; }
+.right { position: absolute; right: 0; }
</style>
</head>
<body>
<div id="corner">
- <h1 id="logo">shaderblaster</h1>
<button id="show-tutorial">help</button>
<button id="show-commands">commands</button>
<select id="examples">
@@ -72,6 +72,14 @@ a { color: #00f; }
</div>
<div id="header">
+ <span class="right">
+ <a href="http://asdf.us/im/">Photoblaster</a>
+ &middot;
+ <a href="http://asdf.us/im/gallery/">Gallery</a>
+ &middot;
+ <a href="http://asdf.us/im/gallery/?tag=shader">Shaders</a>
+ <h1 id="logo">&nbsp;shaderblaster&nbsp;&nbsp;</h1>
+ </span>
<button class="toggle-off">x</button>
<!--
<button id="new-shader"><b>new shader</b></button>