presets

3 files changed, 3 insertions, 18 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 93de396..a40c131 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1430,7 +1430,7 @@ border-left: 1px solid black;
 
 /* WALLPAPER PICKER */
 
-.wallpaper {
+.wallpaper, .presets {
   right: 80px;
   margin-top: 77px;
   width: 172px;
@@ -1440,7 +1440,7 @@ border-left: 1px solid black;
   transform: translateX(400px);
 	padding: 5px 5px 9px 5px;
 }
-.wallpaper.active {
+.wallpaper.active, .presets:active {
   display:inline-block;
   -webkit-transform: translateX(0px);
   transform: translateX(0px);
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 8f42d8d..8b20464 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -21,20 +21,4 @@
       <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
     </span>
   </div>
-
-  <h4>Preset Styles</h4>
-  <div class="presets">
-    <span data-preset="wireframe">
-      Wireframe
-    </span>
-    <span data-preset="shaded">
-      Shaded
-    </span>
-    <span data-preset="inverse">
-      Inverse
-    </span>
-    <span data-preset="pfunk">
-      P.Funk
-    </span>
-  </div>
 </div>
diff --git a/views/editor.ejs b/views/editor.ejs
index 24f617c..330e69b 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -20,6 +20,7 @@
 			[[ include controls/editor/text-editor ]]
 			[[ include controls/editor/collaborators ]]
 			[[ include controls/editor/settings ]]
+			[[ include controls/editor/presets ]]
 		</div>
 
 		<div id="minimap" class="vvbox" data-intro="Mini-map shows your position and orientation in a room. Navigate with WASD keys or drag here." data-position="top">