reset

3 files changed, 33 insertions, 8 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 70cf498..869e5ee 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -597,7 +597,7 @@ iframe.embed {
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
 }
-.destroyActive .mx-scene, .destroyActive .mx-object3d.image {
+.destroyActive .mx-scene, .destroyActive .mx-object3d.image, .menu span.inuse[data-role="destroy-media"] {
 	cursor:url(/assets/img/delete-cursor.png), auto;
 }
 
@@ -1127,7 +1127,19 @@ iframe.embed {
 .mediaContainer img, .mediaContainer video {
   max-width:100%;
 }
-
+#reset {
+	position: fixed;
+	bottom: 160px;
+	left: 20px;
+	border-bottom: 1px solid black;
+	padding-bottom: 3px;
+	z-index:3;
+}
+#reset:hover {
+	cursor:pointer;
+	background:black;
+	color:white;
+}
 #minimap {
 	position: fixed;
 	bottom: 20px;
@@ -1168,6 +1180,7 @@ iframe.embed {
   -webkit-transform: translateX(400px);
   transition: transform 0.1s ease-in-out;
   transform: translateX(400px);
+	padding: 5px 5px 9px 5px;
 }
 .wallpaper.active {
   display:inline-block;
@@ -1192,13 +1205,13 @@ iframe.embed {
 }
 .wallpaper .swatches {
   width: 100%;
-  border-bottom: 1px solid black;
   min-height: 30px;
 }
-.wallpaper {
-  font-size: 14px;
-  font-weight: 300;
+
+.wallpaperUpload {
+	border: 1px solid;
 }
+
 .wallpaper label {
   position: relative;
   top: -6px;
@@ -1206,6 +1219,12 @@ iframe.embed {
 }
 .wallpaper form {
   padding: 2px 0 0 0;
+  font-size: 14px;
+  font-weight: 300;
+}
+.wallpaper form:hover {
+	background:black;
+	color:white;
 }
 .wallpaper .icon-ios7-upload-outline {
   font-size: 26px;
@@ -1367,7 +1386,7 @@ span:hover .swatch {
 }
 
 .settings {
-  padding: 10px 20px 20px 20px;
+  padding: 10px 12px 12px 12px;
   bottom: 20px;
   right: 10px;
   font-size: 12px;
@@ -1872,6 +1891,11 @@ a[data-role="forgot-password"] {
 	padding:5px 0;
 	display: inline-block;
 }
+
+.vvbox .txt {
+	padding:5px;
+}
+
 .aboutRoom h1 a{
   text-decoration: none;
   font-style: italic;
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 208dfff..95cf827 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,5 +1,5 @@
 <div class="vvbox wallpaper">
-	
+	<h4>Add Wallpaper</h4>
 	<!-- IF NO WALL PAPER -->
 	<span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span>
 	
diff --git a/views/editor.ejs b/views/editor.ejs
index 9950878..d2823fa 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -24,6 +24,7 @@
 		<div id="minimap" class="vvbox">
 			<span class="el"></span>
 		</div>
+		<div id="reset">Reset Position</div>
 
 		<div id="hud">
 			<div id="map" style="display: block">