Merge branch 'master' of github.com:okfocus/vvalls

4 files changed, 20 insertions, 14 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 3748401..6929cef 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1247,18 +1247,13 @@ iframe.embed {
 .lightcontrol {
   margin-top: 13%;
   right: 80px;
-  padding: 20px;
+  padding: 13px 20px 20px 20px;
   -webkit-transform: translateX(400px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
   transform: translateX(400px);
   transition: -webkit-transform 0.2s ease-in-out;
 }
-.lightcontrol h4 {
-	font-weight: 600;
-	font-size: 12px;
-	line-height: 0;
-	margin-top: 15px;
-}
+
 .lightcontrol.active {
   -webkit-transform: translateX(0px);
   transform: translateX(0px);
@@ -1278,12 +1273,14 @@ input[type=range] {
 }
 input[type="range"]::-webkit-slider-thumb {
   -webkit-appearance: none;
-  background-color: #000;
-  width: 10px;
-  height: 10px;
+  background-color: white;
+  width: 15px;
+  height: 15px;
   border-radius:10px;
   cursor:pointer;
+	border:3px solid #000;
 }
+
 #color-picker {
   position: relative;
 }
@@ -1353,14 +1350,21 @@ span:hover .swatch {
   left: 10px;
 }
 
+.vvbox h4 {
+	font-weight: 600;
+	margin-bottom: 10px;
+	border-bottom: 1px solid #999;
+	padding-bottom: 6px;
+}
+
 .settings {
-  padding: 20px;
+  padding: 10px 20px 20px 20px;
   bottom: 20px;
   right: 10px;
   font-size: 12px;
-  -webkit-transform: translateY(400px);
+  -webkit-transform: translateY(450px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
-  transform: translateY(400px);
+  transform: translateY(450px);
   transition: -webkit-transform 0.2s ease-in-out;
 }
 
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index b90b646..410aaff 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,9 +1,9 @@
 <div class="vvbox lightcontrol">
+	<h4>Edit Room Colors</h4>
   <div id="color-picker">
   </div>
   
 	<div class="slider">
-		<h4>Luminance Control</h4>
 		<input type="range" min="0" max="110" value="0" id="brightness-control" />
 	</div>
 
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 000e8db..8f2c1c8 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -1,4 +1,5 @@
 <div class="vvbox settings" id="mediaEditor">
+	<h4>Media Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index ed587fa..ad62b55 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,4 +1,5 @@
 <div class="vvbox settings" id="editorSettings">
+	<h4>Room Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">