summaryrefslogtreecommitdiff
path: root/views/builder.ejs
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-07-17 12:18:45 -0400
committerJules Laplace <jules@okfoc.us>2014-07-17 12:18:45 -0400
commit4ee827ad464dfa0edb664d27e5069811877deb1e (patch)
tree69c6ecb890a6af7f6c247c74f81bc36db591e970 /views/builder.ejs
parentb97f3d39ac0e387385aae2685dbe830ee53a686c (diff)
parentf20841988ccd27780d3801e4a6c32bf9afcc9368 (diff)
merge
Diffstat (limited to 'views/builder.ejs')
-rw-r--r--views/builder.ejs3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/builder.ejs b/views/builder.ejs
index 61e84c3..afb8c66 100644
--- a/views/builder.ejs
+++ b/views/builder.ejs
@@ -12,6 +12,7 @@
[[ include partials/header ]]
<div id="builderView">
+ [[ include controls/builder/info ]]
[[ include controls/builder/toolbar ]]
[[ include controls/builder/settings ]]
</div>
@@ -20,7 +21,6 @@
<div id="minimap" class="vvbox">
<span class="el"></span>
</div>
- -->
<select id="palette">
<option>colors</option>
@@ -31,6 +31,7 @@
<option>white</option>
<option>black</option>
</select>
+ -->
<div id="hud">
<div id="map" style="display: block">