From caa97d228bf5c755f0847c6d289096405891754a Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Tue, 30 Sep 2014 18:13:32 -0400
Subject: touchup

---
 public/assets/stylesheets/app.css      | 13 +++++++++----
 views/controls/editor/media-editor.ejs |  3 ++-
 views/controls/editor/toolbar.ejs      | 10 ++++++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 16ad216..80a2be9 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -729,8 +729,8 @@ iframe.embed {
 }
 
 .menu {
-  right: 10px;
-  top: 70px;
+	right: 9px;
+	top: 63px;
   z-index:3;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -923,7 +923,7 @@ iframe.embed {
   padding: 26px 20px;
   margin-left: -200px;
   background: rgba(255,255,255,0.9);
-  z-index: 4;
+  z-index: 7;
   -webkit-transform: translateY(-1000%);
   -webkit-transition: -webkit-transform 0.6s ease-in-out;
   transform: translateY(-1000%);
@@ -1011,6 +1011,11 @@ iframe.embed {
   z-index:4;
 }
 
+.mediaDrawer.mediaViewer h2 {
+	margin-top:20px;
+	font-size:18px;
+}
+
 .mediaDrawer h3{
   margin-top: 28px;
   position: relative;
@@ -1156,7 +1161,6 @@ iframe.embed {
   right: 80px;
   margin-top: 77px;
   width: 162px;
-  z-index: 1;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   -webkit-transform: translateX(400px);
   transition: transform 0.1s ease-in-out;
@@ -1582,6 +1586,7 @@ button {
 }
 #mediaEditor .warn {
 	width:100%;
+	padding:5px 0;
 }
 
 .radio-group {  
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index ef46e6f..305a602 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -43,6 +43,7 @@
 		<label for="scenery-height">height</label>
 		<input type="text" class="units" name="height" id="scenery-height">
 	</div>
+	<!--
 	<div class="setting number">
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
@@ -50,7 +51,7 @@
 			<option value="m">meter</option>
 		</select>
 	</div>
-
+	-->
 	<div class="setting">
 		<a href="#" class="warn btn" data-role="destroy-media">remove from wall</a>
 	</div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 1c4c26f..63df73c 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -12,6 +12,11 @@
 		data-role='destroy-media'
 		data-info="delete media"
 		class="icon-ios7-trash-outline"></span>
+		
+	<span
+		data-role='edit-wall-text'
+		data-info="edit wall text"
+		class="icon-ios7-compose-outline"></span>
  -->
 	<span
 		data-role='toggle-wallpaper-panel'
@@ -21,10 +26,7 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="icon-ios7-sunny-outline"></span>
-	<span
-		data-role='edit-wall-text'
-		data-info="edit wall text"
-		class="icon-ios7-compose-outline"></span>
+		
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
-- 
cgit v1.2.3-70-g09d2