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

9 files changed, 116 insertions, 56 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 23d8e60..a7a3517 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -221,7 +221,7 @@ iframe.embed {
 }
 
 .viewMore:hover {
-	background: lightgreen;
+	background: black;
 	color: white;
 }
 
@@ -306,22 +306,15 @@ iframe.embed {
   padding:80px;
 }
 .subButtons a {
-  margin: 9px 0;
-  border: 0;
-  background: transparent;
-  font-size: 15px;
-  font-weight: 300;
-  width: 33.33333333333%;
   display: inline-block;
   float: left;
-  text-decoration:none;
 }
-.subButtons a:hover {
-  text-decoration:underline;
+
+.subButtons a:nth-child(2){
+ margin-left:5px;
 }
 .subButtons a:nth-child(3){
- color:#FF3A2D; 
- float: right;
+ float:right;
 }
 .page .questions span{
   font-weight:300;
@@ -368,8 +361,9 @@ iframe.embed {
 }
 
 .footer {
-  width: 100%;
-  margin: 80px 0;
+	width: 100%;
+	padding: 80px 0;
+	background: #f9f9f9;
 }
 
 .footer a, .footer span{
@@ -401,7 +395,7 @@ iframe.embed {
 	position: relative;
   font-size: 18px;
   padding: 8px;
-  margin: 14px;
+  margin: 4px;
   -webkit-user-select: none;
   -moz-user-select: none;
   user-select: none;
@@ -413,11 +407,13 @@ iframe.embed {
   padding: 8px;
   color: black;
   font-weight: 300;
+	float:right;
   text-decoration: none;
   border-bottom:1px solid transparent;
 }
 .topLinks a:hover {
-  border-bottom:1px solid lightgreen;
+	background: black;
+	color: white;
 }
 .profilepage .bio {
   text-align: left;
@@ -710,8 +706,14 @@ iframe.embed {
   display: inline-block;
   background: white;
   box-shadow: -3px 3px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+.vvbox .txt {
+	padding: 5px;
+	display: inline-block;
 }
-
 .edit-video.menu,
 .edit-image.menu {
 	right: auto;
@@ -1007,7 +1009,7 @@ iframe.embed {
 }
 
 .editBtn:hover {
- background:lightgreen;
+ background:black;
 }
 
 .deleteArmed .mediaDrawer h3 {
@@ -1218,6 +1220,12 @@ iframe.embed {
   transform: translateX(400px);
   transition: -webkit-transform 0.2s ease-in-out;
 }
+h4 {
+	font-weight: 600;
+	font-size: 12px;
+	line-height: 0;
+	margin-top: 15px;
+}
 .lightcontrol.active {
   -webkit-transform: translateX(0px);
   transform: translateX(0px);
@@ -1249,12 +1257,12 @@ input[type="range"]::-webkit-slider-thumb {
 .swatch {
   width: 20px;
   height: 20px;
-  border: 1px solid black;
+  border: 1px solid #eee;
   display: inline-block;
   cursor: pointer;
 }
 .swatch.selected {
-  border-width: 2px;
+  border: 1px solid #000;
 }
 .color-swatches {
   margin-top: 10px;
@@ -1270,7 +1278,7 @@ input[type="range"]::-webkit-slider-thumb {
   cursor: pointer;
 }
 .color-swatches label.selected {
-  font-weight: 500;
+  font-weight: 600;
 }
 
 
@@ -1358,6 +1366,7 @@ input[type="range"]::-webkit-slider-thumb {
 .settings .setting {
   margin-bottom:10px;
 }
+.settings
 .settings .setting a {
 	text-decoration:none;
 }
@@ -1368,10 +1377,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 .settings .subButtons a {
   font-size: 12px;
-  font-weight: 300;
-  width: 40px;
-  margin: 0;
 }
+
 .settings .setting:last-child{
   margin-bottom:0px;
 }
@@ -1390,6 +1397,10 @@ input[type="range"]::-webkit-slider-thumb {
 	float: left;
 	position: relative;
 	top: 5px;
+	font-weight:600;
+}
+.setting.number label:after {
+	content:":";
 }
 .setting.number.halflines {
 	height: 30px;
@@ -1454,22 +1465,42 @@ input[type="range"]::-webkit-slider-thumb {
 	padding-right: 3px;
 }
 
+.btn, button {
+	background:white;
+	color:black;
+	padding:3px;
+	text-decoration:none;
+	 cursor: pointer;
+	border:1px solid;
+}
+
+.btn:hover, button:hover {
+  background:black;
+  color:white;
+}
+
+.warn {
+	background:red;
+	display: inline-block;
+	color:white;
+	border:1px solid red;
+	text-align: center;
+}
+
 button {
   padding: 8px;
-  border: 1px solid;
   float: right;
   font-weight: 500;
-  background: white;
-  cursor: pointer;
   width: 100%;
+	font-size:14px;
 }
 
-button:hover {
-  background:black;
-  color:white;
+#builder-units {
+	width:100%;
+}
+#mediaEditor .warn {
+	width:100%;
 }
-
-
 
 .radio-group {  
   width: 182px;
@@ -1581,9 +1612,9 @@ form input[type="submit"] {
 	padding: 10px 0;
 }
 form input[type="submit"]:hover {
-	background:lightgreen;
+	background:black;
 	color:white;
-	border:1px solid lightgreen;
+	border:1px solid black;
 	cursor:pointer;
 }
 form p{
@@ -1651,7 +1682,7 @@ form li textarea {
 }
 
 .demo .video span.icon-ios7-play-outline:hover {
-  color:lightgreen;
+  color:black;
 }
 
 .box {
@@ -1659,6 +1690,12 @@ form li textarea {
   vertical-align: middle;
   width: 100%;
 }
+.question {
+	font-size: 43px;
+	font-weight: 300;
+	margin-bottom: 10px;
+	display: inline-block;
+}
 
 .close {
 	font-weight: 100;
@@ -1678,7 +1715,7 @@ form li textarea {
 }
 
 .close:hover {
-  background:lightgreen;
+  background:black;
 	color:white;
 }
 
@@ -1698,7 +1735,7 @@ form li textarea {
 }
 /*
 .facebook:hover{
-  background:lightgreen;
+  background:black;
 }
 */
 .box b.signin-tagline {
@@ -1738,6 +1775,13 @@ a[data-role="forgot-password"] {
   border: 1px solid;
 }
 
+.aboutRoom h1 {
+	font-size:28px;
+}
+.txt {
+	font-size:12px;
+	padding:5px 0;
+}
 .aboutRoom h1 a{
   text-decoration: none;
   font-style: italic;
@@ -1748,14 +1792,26 @@ a[data-role="forgot-password"] {
 }
 
 .aboutRoom .editlink {
-  color: red;
-  text-decoration: none;
-  border-bottom: 1px dotted;
+	color: black;
+	text-decoration: none;
+	border-bottom: 0;
+	background: white;
+	padding: 6px;
+	display: inline-block;
+	margin-top: 10px;
+	width: 100%;
+	text-align: center;
+	border:1px solid black;
+}
+
+.aboutRoom .editlink:hover {
+	background:black;
+	color:white;
 }
 
 .aboutRoom h2{
   font-size: 13px;
-  margin: 5px 0;
+  margin: 5px 0 0 0;
 }
 
 .share {
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index a67df34..1ed6ef6 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,8 +1,7 @@
 <div class="vvbox lightcontrol">
-
 	<div class="slider">
+		<h4>Brightness Control</h4>
 		<input type="range" min="0" max="110" value="0" id="brightness-control" />
-		<h4>Brightness</h4>
 	</div>
 
   <div class="color-swatches">
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 456699c..241164f 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -17,7 +17,7 @@
 <div class="mediaDrawer fixed animate mediaViewer">
 	<span class="close">X</span>
 	<h2><a href="#" class="yourMedia active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
-	<h3 class="editBtn" id="deleteMedia">delete media</h3>
+	<h3 class="editBtn warn" id="deleteMedia">delete media?</h3>
 	<div class="myMedia">
 	</div>
 	
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 7f8f299..000e8db 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -50,7 +50,7 @@
 		</select>
 	</div>
 
-	<div class="setting subButtons">
-		<a href="#" data-role="destroy-media">Delete</a>
+	<div class="setting">
+		<a href="#" class="warn btn" data-role="destroy-media">delete this media</a>
 	</div>
 </div>
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index e4ec7ee..ed587fa 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -27,11 +27,11 @@
 		<div class="radio-group">
 			<input id="privacy_private" class="radio-group__option" type="radio" name="privacy" value="public" checked>
 			<label class="radio-group__label" for="privacy_private">
-				Everyone
+				Public
 			</label>
 			<input id="privacy_public" class="radio-group__option" type="radio" name="privacy" value="private">
 			<label class="radio-group__label" for="privacy_public">
-				Just for me
+				Private
 			</label>
 		</div>
 	</div>
@@ -39,8 +39,8 @@
 		<button data-role="save-project">Save</button>
 	</div>
 	<div class="setting subButtons">
-		<a href="#" data-role="clear-project">Clear</a>
-		<a href="#" data-role="clone-project">Clone</a>
-		<a href="#" data-role="destroy-project">Delete</a>
+		<a href="#" data-role="clear-project" class="btn">Clear</a>
+		<a href="#" data-role="clone-project" class="btn">Clone</a>
+		<a href="#" data-role="destroy-project" class="btn warn">Delete Room</a>
 	</div>
 </div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index e073df4..4abf780 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -17,7 +17,7 @@
 		class="icon-ios7-keypad-outline"></span>
 	<span
 		data-role='toggle-light-control'
-		data-info="light control"
+		data-info="edit room colors"
 		class="icon-ios7-sunny-outline"></span>
 	<span
 		data-role='edit-wall-text'
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 02ab16d..208dfff 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,8 +1,13 @@
 <div class="vvbox wallpaper">
+	
+	<!-- IF NO WALL PAPER -->
+	<span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span>
+	
   <div class="swatches"></div>
   
   <div class="wallpaperUpload">
     <form>
+
       <span class="icon-ios7-upload-outline upload-icon"></span>
       <label>Upload wallpaper</label>
       <input type="file" accept="image/*" class="file" multiple>
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index 2aa244b..60ac46e 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -1,15 +1,15 @@
 <div class="aboutRoom vvbox">
 	<h1>
-		[[- name ]],<br>
+		[[- name ]],
 		<a href="[[- authorlink ]]">[[- author ]]</a>
 	</h1>
+	<span class="txt">[[- description ]]</span>
 	<h2>
 	  Last modified [[- date ]]
 	  [[ if (canEdit) { ]]
-	    &middot; <a href="[[- editlink ]]" class="editlink">Edit</a>
+	    <br> <a href="[[- editlink ]]" class="editlink">Edit Room</a>
 	  [[ } ]]
 	</h2>
-	<span>[[- description ]]</span>
 </div>
 
 <div class="share">
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 2b6aa1e..b001734 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -12,7 +12,7 @@
 			[[ if (i == 0) { ]]
 			<td class="border room1" colspan=3">
 			[[ } else { ]]
-			<td class="border room1">
+			<td class="room1">
 			[[ } ]]
 				<iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe>
 				[[ if (String(user._id) == String(project.user_id)) { ]]