merge

1 files changed, 46 insertions, 13 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index a5b1733..36cccef 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -230,6 +230,12 @@ iframe.embed {
   color:white;
 }
 
+#projectList .editBtn {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+}
+
 /*
 .room1 {
   position: relative;
@@ -240,12 +246,6 @@ iframe.embed {
   background-image:url(https://s3.amazonaws.com/luckyplop/fd4ebe8a7a4246c8273fc999fb1ef0d6a8260b8c.png);
 }
 
-.room1 .editBtn {
-  position: absolute;
-  right: 10px;
-  top: 10px;
-}
-
 .room1 form textarea {
   width: 226px;
 }
@@ -526,20 +526,25 @@ iframe.embed {
   position:fixed;
   top:0;
   left:0;
-  cursor: -webkit-grab;
-  cursor: -moz-grab;
   z-index: 1;
   position: fixed;
   top: 50%;
   left: 50%;
   -webkit-transform: translate3d(-50%, -50%, 0);
   transform: translate3d(-50%, -50%, 0);
-  cursor:pointer;
+  cursor: -webkit-grab;
+  cursor: -moz-grab;
 }
 .mx-scene:active{
   cursor: -webkit-grabbing;
   cursor: -moz-grabbing;
 }
+.mx-scenery {
+  cursor: pointer;
+}
+.mx-scenery:active {
+  cursor: pointer;
+}
 .mx-object3d.image,
 .mx-object3d.video,
 .mx-object3d iframe,
@@ -573,6 +578,28 @@ iframe.embed {
 	z-index: 10;
 }
 
+#map {
+  cursor: crosshair;
+}
+#map.move {
+  cursor: move;
+}
+#map.ew-resize {
+  cursor: ew-resize;
+}
+#map.ns-resize {
+  cursor: ns-resize;
+}
+#map.nesw-resize {
+  cursor: nesw-resize;
+}
+#map.nwse-resize {
+  cursor: nwse-resize;
+}
+#map.destroy {
+  cursor: url(/assets/img/destroy-cursor.png) 12 12, auto;
+}
+
 .face {
 	background-color: #fff;
 	transition: 0.1s background-color ease;
@@ -581,11 +608,10 @@ iframe.embed {
 .back  { background-color: #fff; }
 .left  { background-color: #fff; }
 .right { background-color: #fff; }
-.floor { background-color: #eee; }
-.ceiling { background-color: rgba(230,230,255,0.3); }
+.floor { background-color: #f8f8f8; }
+.ceiling { background-color: rgba(255,525,255,0.3); }
 
-.active.floor { background-color: #ffe; }
-.active.ceiling { background-color: rgba(230,230,255,0.3); }
+.active.floor { background-color: #f8f8f8; }
 
 .dragging .mx-object3d.image {
 	pointer-events: none;
@@ -1269,6 +1295,13 @@ input[type="range"]::-webkit-slider-thumb {
 	top: 0px;
 }
 
+#mediaEditor .setting.number label {
+	width: 40px;
+}
+#mediaEditor .setting.number [type=text] {
+	width: 140px;
+}
+
 .playButton,.muteButton {
 	color: white;
 	background: black;