merge

5 files changed, 31 insertions, 9 deletions

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 4619eb1..33333fb 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -293,7 +293,7 @@
         this.el = this.rect = this.face = null
 			}
 
-			// possible if walls are opaque
+			// preferable if walls are opaque
 			// el.el.classList.add("backface-hidden")
 
 			return el
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 8a707ec..0b1da0b 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -4,6 +4,7 @@ var EditorToolbar = View.extend({
 
 	events: {
 	  "mousedown": 'stopPropagation',
+		"click [data-role='undo']": 'undo',
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
@@ -18,6 +19,17 @@ var EditorToolbar = View.extend({
 		this.parent = opt.parent
 	},
 
+	undo: function(e){
+		if (e.shiftKey) {
+			var canRedo = UndoStack.redo()
+			console.log("can redo", canRedo)
+		}
+		else {
+			var canUndo = UndoStack.undo()
+			console.log("can undo", canUndo)
+		}
+	},
+	
 	toggleMap: function(){
 		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
 		this.resetControls()
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 509deb5..849c994 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -337,7 +337,7 @@ iframe.embed {
 }
 .projectList .room {
 	width: 22vw;
-	height: 17vw;
+	height: 16vw;
 	margin: 1vw 1vw 10px 1vw;
 	display: table;
 	position: relative;
@@ -1440,6 +1440,10 @@ border-left: 1px solid black;
   transform: translateX(400px);
 	padding: 5px 5px 9px 5px;
 }
+
+#presets {
+	margin-top: 110px;
+}
 .wallpaper.active, #presets.active {
   display:inline-block;
   -webkit-transform: translateX(0px);
@@ -1643,7 +1647,7 @@ input[type="range"]::-webkit-slider-thumb {
   border-bottom: 1px transparent solid;
 }
 .presets span.active {
-  border-bottom: 1px dotted;
+	text-decoration: underline;
 }
 .color-swatches span {
 	display: inline-block;
@@ -1846,13 +1850,15 @@ input[type="range"]::-webkit-slider-thumb {
 }
 
 .playButton,.muteButton {
-	color: white;
-	background: black;
 	border-radius: 50px;
 	font-size: 22px;
-	padding: 4px 2px 3px 6px;
+	padding: 5px 0;
 	cursor: pointer;
 	margin-right: 5px;
+	width: 40px;
+	display: inline-block;
+	text-align: center;
+	border: 1px solid;
 }
 .playButton .on {
 	display: inline;
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index f5e3b5b..1f4f720 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -13,8 +13,8 @@
 	
 	<div class="video setting">
 		<span class="playButton" data-role="play-media">
-			<span class="on ion-play"></span>
-			<span class="off ion-pause"></span>
+			<span class="on ion-ios7-play-outline"></span>
+			<span class="off ion-ios7-pause-outline"></span>
 		</span>
 <!-- 
 		ion-volume-high
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 47d7c3c..57a98b9 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,10 +1,14 @@
 
 <div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left">
 	<span
+		data-role='undo'
+		data-info="undo"
+		class="ion-reply"></span>
+	<span
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="ion-ios7-photos-outline"></span>
-  <span
+	<span
     data-role='toggle-presets'
     data-info="preset styles"
     class="ion-ios7-briefcase-outline"></span>