From 704fbb9156299cfa49fc9c514b641dd77423c121 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 29 Sep 2014 13:46:17 -0400
Subject: fix z-index on saving indicator

---
 public/assets/stylesheets/app.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 17a7dc0..8712a41 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -652,7 +652,7 @@ iframe.embed {
 
 #minotaur {
   position: absolute;
-  top: 26px;
+  top: 25px;
   right: 260px;
   opacity: 0;
 }
@@ -662,8 +662,11 @@ iframe.embed {
   font-weight: 300;
 }
 #minotaur.saving {
-  background: #8fd;
+  background: white;
   opacity: 1;
+  z-index: 20;
+  font-size: 13px;
+  border: 1px solid;
 }
 #minotaur.saving .label:after {
   content: 'SAVING';
-- 
cgit v1.2.3-70-g09d2


From 7cd5291ff363c0fcd776e1039c2af650b758d70d Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 29 Sep 2014 14:07:29 -0400
Subject: some styles

---
 public/assets/stylesheets/app.css | 88 ++++++++++++++++++++++++++++-----------
 views/home.ejs                    |  3 +-
 views/partials/edit-profile.ejs   |  5 ++-
 views/partials/header.ejs         |  2 +-
 views/partials/sign-in.ejs        |  4 +-
 views/profile.ejs                 |  2 +-
 views/projects/list-projects.ejs  |  3 +-
 7 files changed, 74 insertions(+), 33 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 17a7dc0..8816673 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -221,7 +221,8 @@ iframe.embed {
 }
 
 .viewMore:hover {
-  text-decoration:underline;
+	background: lightgreen;
+	color: white;
 }
 
 .page .roomName {
@@ -388,7 +389,8 @@ iframe.embed {
   margin-right: 10px;
   color: black;
   font-weight: 100;
-  text-decoration: none
+  text-decoration: none;
+	padding: 50px 0 100px 0;
 }
 .editProfile span {
   vertical-align: middle;
@@ -1353,6 +1355,9 @@ input[type="range"]::-webkit-slider-thumb {
 .settings .setting {
   margin-bottom:10px;
 }
+.settings .setting a {
+	text-decoration:none;
+}
 .setting.subButtons {
   display: inline-block;
   width: 100%;
@@ -1469,6 +1474,7 @@ button:hover {
   table-layout: fixed;
   border-spacing: 0;
   border-collapse: separate;
+	overflow:hidden;
 }
 
 .radio-group__label {
@@ -1478,7 +1484,7 @@ button:hover {
   vertical-align: middle;
   text-align: center;
   position: relative;
-  border: 1px solid #ccc;
+  border: 1px solid #000;
   cursor:pointer;
   border-style: solid none solid solid;
  /* border-radius: 5px 0 0 5px;*/
@@ -1491,19 +1497,19 @@ button:hover {
 }
   
 .radio-group__label + input + .radio-group__label:before {
-  content: " ";
-  display: block;
-  position: absolute;
-  top:-1px;
-  width: 100%;
-  height: 100%;
-  border: 1px solid #000;
-  /*border-radius: 5px 0 0 5px;*/
-  -webkit-transform: translate3d(-103%,0,0);
-  -webkit-transition: all 250ms;
-  transform: translate3d(-103%,0,0);
-  transition: all 250ms;
-  background:;
+	content: " ";
+	display: block;
+	position: absolute;
+	top: 0px;
+	width: 94px;
+	height: 100%;
+	border: 0;
+	/* border-radius: 5px 0 0 5px; */
+	-webkit-transform: translate3d(-103%,0,0);
+	-webkit-transition: all 250ms;
+	transform: translate3d(-103%,0,0);
+	transition: all 250ms;
+	background: rgba(0,0,0,0.1);
 }  
 
 .radio-group__label + input:checked + .radio-group__label:before {
@@ -1528,6 +1534,24 @@ form {
 form div {
 	float:right;
 }
+form div.hidden {
+	height: 0;
+	overflow: hidden;
+}
+form h3.link {
+	content:"?";
+}
+form h3.link:after {
+	content:"?";
+}
+
+form h3.link:hover {
+	color:#017cfe;
+	cursor:pointer;
+}
+
+
+
 form li {
 	font-size: 20px;
 	font-weight: 300;
@@ -1634,18 +1658,25 @@ form li textarea {
 }
 
 .close {
-  font-weight: 100;
-  font-size: 120px;
-  float: right;
-  cursor: pointer;
-  position: fixed;
-  right: 20px;
-  top: 20px;
-  z-index: 20;
+	font-weight: 100;
+	font-size: 70px;
+	float: right;
+	cursor: pointer;
+	position: fixed;
+	right: 20px;
+	top: 20px;
+	z-index: 20;
+	background: #f9f9f9;
+	width: 75px;
+	color: black;
+	border: 1px solid black;
+	box-shadow: -3px 4px black;
+	line-height: 75px;
 }
 
 .close:hover {
-  color:lightgreen;
+  background:lightgreen;
+	color:white;
 }
 
 
@@ -1673,6 +1704,8 @@ form li textarea {
   margin-bottom: 18px;
   font-weight: 500;
   font-size: 12px;
+	border-bottom: 1px solid #444;
+	padding-bottom: 20px;
   letter-spacing: 2px;
 }
 .facebook b {
@@ -1680,6 +1713,11 @@ form li textarea {
   font-size: 50px;
 }
 
+a[data-role="forgot-password"] {
+	font-size:11px;
+	margin-top:10px;
+}
+
 .facebook span {
   vertical-align: bottom;
   padding-right: 14px;
diff --git a/views/home.ejs b/views/home.ejs
index 8b83a8f..5240ae1 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -16,8 +16,9 @@
 	<table class="demo">
 		<tr>
 			<td class="video" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
+				<span class="videoTitle">Create 3D Rooms</span><br>
 				<span class="icon-ios7-play-outline"></span><br>
-				<span class="videoTitle">Welcome to VVALLS</span>
+				<span class="videoTitle">Watch video.</span>
 			</td>
 		</tr>
 	</table>
diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs
index 96e9da4..a39f856 100644
--- a/views/partials/edit-profile.ejs
+++ b/views/partials/edit-profile.ejs
@@ -61,8 +61,9 @@
 				</li>		
 
 				<li class="section_break">
-					<h3>Change Password</h3>
+					<h3 class="link">Change Password</h3>
 				</li>
+				<div class="hidden">
 				<li>
 					<label class="description" for="profile_old_password">Old Password:</label>
 					<div>
@@ -81,7 +82,7 @@
 						<input id="profile_new_password2" class="element text medium" type="password" maxlength="255"> 
 					</div> 
 				</li>
-
+				</div>
 				<li class="buttons">
 					<input id="saveForm" class="button_text" type="submit" value="Submit" />
 				</li>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index 6697aff..a48c5e1 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -14,7 +14,7 @@
 	<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>
 
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
-	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a>
+	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a>
 	[[ } else if (! profile) { ]]
 	<a href="/profile" class="topLink">Profile</a>
 	[[ } ]]
diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs
index 8268b2a..98f0acc 100644
--- a/views/partials/sign-in.ejs
+++ b/views/partials/sign-in.ejs
@@ -6,7 +6,7 @@
 		<form id="signIn" method="post">
 			<input type="hidden" name="_csrf" value="[[- token ]]">
 			<a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign in with Facebook</span></a>
-			<b class="signin-tagline">– or the ol' fashion way –</b>
+			<b class="signin-tagline">– or with your email –</b>
 			<li>
 				<label class="description" for="usernameInput">Username:</label>
 				<div>
@@ -39,7 +39,7 @@
 		<form id="signUp" method="post">
 			<input type="hidden" name="_csrf" value="[[- token ]]">
 			<a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign up with Facebook</span></a>
-			<b class="signin-tagline">– or the ol' fashion way –</b>
+			<b class="signin-tagline">– or with your email –</b>
 			<li>
 				<label class="description" for="usernameInput">Username:</label>
 				<div>
diff --git a/views/profile.ejs b/views/profile.ejs
index 8dd3c6d..ada3d52 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -45,7 +45,7 @@
 	
 	[[ include projects/list-projects ]]
 
-	<a href="#" data-role="new-project-modal" class="viewMore">create project</a>
+	<a href="#" data-role="new-project-modal" class="viewMore btn">create project</a>
 	
 	[[ include partials/edit-profile ]]
 	[[ include projects/layouts-modal ]]	
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index c41ae07..2b6aa1e 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -2,8 +2,9 @@
 		
 	<table class="projectList">
 		<tr>
-
+				
 		[[ projects.forEach(function(project, i) { ]]
+
 			[[ if (i % 4 == 1) { ]]
 			</tr><tr>
 			[[ } ]]
-- 
cgit v1.2.3-70-g09d2


From a18a6f0d2fa629fc25004b516c960b794de2ec52 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 29 Sep 2014 17:07:22 -0400
Subject: stylez

---
 public/assets/stylesheets/app.css       | 138 ++++++++++++++++++++++----------
 views/controls/editor/light-control.ejs |   3 +-
 views/controls/editor/media-drawer.ejs  |   2 +-
 views/controls/editor/media-editor.ejs  |   4 +-
 views/controls/editor/settings.ejs      |  10 +--
 views/controls/editor/toolbar.ejs       |   2 +-
 views/controls/editor/wallpaper.ejs     |   5 ++
 views/controls/reader/about-room.ejs    |   6 +-
 views/projects/list-projects.ejs        |   2 +-
 9 files changed, 116 insertions(+), 56 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

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)) { ]]
-- 
cgit v1.2.3-70-g09d2


From e8bdd7f9f64ad07aed8097c2072863fcdbcb1c3e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 29 Sep 2014 17:43:49 -0400
Subject: write titles under layout names, in the layout picker as well as the
 project picker

---
 public/assets/javascripts/ui/site/LayoutsModal.js |  1 +
 public/assets/stylesheets/app.css                 | 12 ++++++++++++
 2 files changed, 13 insertions(+)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index bfc3dec..1bfc6cb 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -25,6 +25,7 @@ var LayoutsIndex = View.extend({
 			// $span.html(JSON.stringify(room))
 			$span.data("slug", room.slug)
 			$span.css("background-image", "url(" + room.photo + ")")
+			$span.attr("data-name", room.name)
 			
 			this.$templates.append($span)
 		}.bind(this))
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index a7a3517..cadd11d 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -497,6 +497,18 @@ iframe.embed {
   display: inline-block;
   margin: 4vw;
   border:1px solid white;
+  position: relative;
+}
+
+.templates span:after {
+  content: attr(data-name);
+  position: absolute;
+  top: 100%;
+  width: 100%;
+  left: 0;
+  background: #fff;
+  padding: 5px;
+  border-top: 1px solid black;
 }
 
 .templates span:hover {
-- 
cgit v1.2.3-70-g09d2


From ffe8d0ab107347f7245d5b2166145e651a1616a9 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 29 Sep 2014 17:52:13 -0400
Subject: new style for front page items

---
 public/assets/stylesheets/app.css | 61 ++++++++++++++++++++++-----------------
 views/projects/list-projects.ejs  | 19 ++++++------
 2 files changed, 43 insertions(+), 37 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index a7a3517..1f1b1fe 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -6,6 +6,9 @@
 	outline:0;
 	font-family: 'Lato', sans-serif;
 	-webkit-font-smoothing: subpixel-antialiased;
+	-webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
 }
 *, *:before, *:after {
   moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
@@ -173,17 +176,11 @@ h5 {
   border-spacing: 0;
   clear: both;
 }
-.page table.profilepage tr,
-.page table.projectList tr {
-  height: 400px;
-}
+
 .page table.showcase {
   height:70vh;
 }
-.page table.projectList td.border {
-	position: relative;
-  border-right: 1px solid;
-}
+
 iframe.embed {
 	width: 100%;
 	height: 100%;
@@ -194,35 +191,47 @@ iframe.embed {
 	z-index: -1;
 	pointer-events: none;
 }
-.page table.demo td,
-.page table.profilepage td,
-.page table.projectList td {
+.projectList {
+	display: inline-block;
+	float: left;
+	width: 100%;
+}
+.projectList .room {
   width: 33.3333%;
-  background-size: cover;
-  background-repeat: no-repeat;
-  background-position: center;
-  border-bottom:1px solid black;
+	height:40vh;
+	display:table;
+	position: relative;
+	float:left;
+	border-top:1px solid black;
 }
+.projectList .room:nth-child(4n+1){
+	width:100%;
+}
+.page .btn {
+	clear: both;
+	padding: 30px 0;
+	border: 0;
 
+}
 .page table.showcase td {
   height: 70vh;
   background-size: cover;
 }
 
-.viewMore {
-  color: #017cfe;
+.page .viewMore {
   text-decoration: none;
-  font-weight: 300;
   font-size: 22px;
-  padding-top: 20px;
   display: block;
-  border-bottom: 1px solid black;
-  padding-bottom: 19px;
+	border-top: 1px solid black;
+	border-bottom: 1px solid black;
 }
 
-.viewMore:hover {
-	background: black;
-	color: white;
+
+.holder {
+	display: table-cell;
+	height: 100%;
+	width: 100%;
+	vertical-align: middle;
 }
 
 .page .roomName {
@@ -396,9 +405,7 @@ iframe.embed {
   font-size: 18px;
   padding: 8px;
   margin: 4px;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
+
 }
 .topLinks span {
   font-weight: 300;
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index b001734..3801e30 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -1,32 +1,31 @@
 [[ if (projects.length) { ]]
 		
-	<table class="projectList">
-		<tr>
-				
+	<div class="projectList">
+
 		[[ projects.forEach(function(project, i) { ]]
 
 			[[ if (i % 4 == 1) { ]]
-			</tr><tr>
+
 			[[ } ]]
 			
 			[[ if (i == 0) { ]]
-			<td class="border room1" colspan=3">
+			<span class="room">
 			[[ } else { ]]
-			<td class="room1">
+			<span class="room">
 			[[ } ]]
 				<iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe>
 				[[ if (String(user._id) == String(project.user_id)) { ]]
 				<a href="/project/[[- project.slug ]]/edit"><div class="editBtn">edit</div></a>
 				[[ } ]]
+				<div class="holder">
 				<a href="/project/[[- project.slug ]]" class="roomName">
 					[[- project.name ]]<br>
 					[[- project.date ]]
 				</a>
-			</td>
+				</div>
+			</span>
 
 		[[ }) ]]
-
-		</tr>
-	</table>
+	</div>
 
 [[ } ]]
-- 
cgit v1.2.3-70-g09d2


From 22ab941f4630f545cc7d0475611d056372fcad10 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 29 Sep 2014 18:18:44 -0400
Subject: color picker UI

---
 public/assets/stylesheets/app.css       | 59 ++++++++++++++++++++++-----------
 views/controls/editor/light-control.ejs | 10 +++++-
 views/controls/reader/about-room.ejs    |  2 +-
 3 files changed, 50 insertions(+), 21 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 3f3b8f7..f2ade63 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -729,10 +729,7 @@ iframe.embed {
   -moz-user-select: none;
   user-select: none;
 }
-.vvbox .txt {
-	padding: 5px;
-	display: inline-block;
-}
+
 .edit-video.menu,
 .edit-image.menu {
 	right: auto;
@@ -1239,7 +1236,7 @@ iframe.embed {
   transform: translateX(400px);
   transition: -webkit-transform 0.2s ease-in-out;
 }
-h4 {
+.lightcontrol h4 {
 	font-weight: 600;
 	font-size: 12px;
 	line-height: 0;
@@ -1273,12 +1270,17 @@ input[type="range"]::-webkit-slider-thumb {
 .colorPicker {
   cursor: crosshair;
 }
+
 .swatch {
   width: 20px;
   height: 20px;
   border: 1px solid #eee;
   display: inline-block;
   cursor: pointer;
+	float:left;
+}
+.swatch:hover {
+	border: 1px solid red;
 }
 .swatch.selected {
   border: 1px solid #000;
@@ -1286,17 +1288,36 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches {
   margin-top: 10px;
 }
+.color-swatches span {
+	display: inline-block;
+	width: 50%;
+	float:left;
+	cursor:pointer;
+}
+.color-swatches span.active{
+	background:black;
+	color:white;
+}
+.color-swatches span:nth-child(3){
+	clear:left;
+}
+.color-swatches span:hover {
+	background:#eee;
+}
+
+.color-swatches span.active:hover {
+	background:#000;
+}
 .color-swatches label {
-  font-size: 11px;
-  font-weight: 300;
-  position: relative;
-  top: -6px;
-  padding-left: 5px;
-  display: inline-block;
-  min-width: 35px;
-  cursor: pointer;
+	font-size: 14px;
+	font-weight: 300;
+	position: relative;
+	padding-left: 5px;
+	display: inline-block;
+	cursor: pointer;
+	top: -2px;
 }
-.color-swatches label.selected {
+.color-swatches span.active label {
   font-weight: 600;
 }
 
@@ -1497,11 +1518,14 @@ input[type="range"]::-webkit-slider-thumb {
   background:black;
   color:white;
 }
-
+.btn.marg {
+	margin-top:10px;
+}
 .warn {
 	background:red;
 	display: inline-block;
 	color:white;
+	text-decoration:none;
 	border:1px solid red;
 	text-align: center;
 }
@@ -1800,6 +1824,7 @@ a[data-role="forgot-password"] {
 .txt {
 	font-size:12px;
 	padding:5px 0;
+	display: inline-block;
 }
 .aboutRoom h1 a{
   text-decoration: none;
@@ -1811,16 +1836,12 @@ a[data-role="forgot-password"] {
 }
 
 .aboutRoom .editlink {
-	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 {
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 1ed6ef6..65a602f 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -5,11 +5,19 @@
 	</div>
 
   <div class="color-swatches">
+	<span>
     <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
+	</span>
+	<span class="active">
     <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
+	</span>
+	<span>
     <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
-    <br>
+	</span>
+	<span>
     <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
+	</span>
+	<span>
   </div>
 
 <!--
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index 60ac46e..b27ea6d 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -7,7 +7,7 @@
 	<h2>
 	  Last modified [[- date ]]
 	  [[ if (canEdit) { ]]
-	    <br> <a href="[[- editlink ]]" class="editlink">Edit Room</a>
+	    <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
 	  [[ } ]]
 	</h2>
 </div>
-- 
cgit v1.2.3-70-g09d2


From b9a926a99b3f655ce2e0022335bc2bffb559f5f7 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 29 Sep 2014 18:20:33 -0400
Subject: tweek

---
 public/assets/stylesheets/app.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index f2ade63..fe67edc 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1294,8 +1294,11 @@ input[type="range"]::-webkit-slider-thumb {
 	float:left;
 	cursor:pointer;
 }
+.color-swatches span:nth-child(1),.color-swatches span:nth-child(2){
+	margin-bottom:5px;
+}
 .color-swatches span.active{
-	background:black;
+	background:red;
 	color:white;
 }
 .color-swatches span:nth-child(3){
@@ -1306,7 +1309,7 @@ input[type="range"]::-webkit-slider-thumb {
 }
 
 .color-swatches span.active:hover {
-	background:#000;
+	background:red;
 }
 .color-swatches label {
 	font-size: 14px;
-- 
cgit v1.2.3-70-g09d2


From 81c4dd5a89472dfea21d6bdb4b08cd9a88723fbf Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 29 Sep 2014 18:31:32 -0400
Subject: cool circle thing on front page

---
 public/assets/stylesheets/app.css | 39 +++++++++++++++++++--------------------
 views/home.ejs                    |  6 ++++--
 2 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index fe67edc..fe50b92 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -167,17 +167,16 @@ h5 {
 .page.profile {
   color:white;
 }
-.page table.demo,
-.page table.profilepage,
-.page table.projectList {
+.page .demo,
+.page .profilepage,
+.page .projectList {
   width: 100%;
-  border-top: 1px solid;
   margin: 40px 0 0 0;
   border-spacing: 0;
   clear: both;
 }
 
-.page table.showcase {
+.page .showcase {
   height:70vh;
 }
 
@@ -213,10 +212,6 @@ iframe.embed {
 	border: 0;
 
 }
-.page table.showcase td {
-  height: 70vh;
-  background-size: cover;
-}
 
 .page .viewMore {
   text-decoration: none;
@@ -1714,23 +1709,27 @@ form li textarea {
 .demo .video {
   height:80vh;
   min-height:300px;
+	background-size:cover;
+	border-bottom:1px solid;
 }
 
-.demo .video span {
-  font-size:100px;
-  color:white;
-  cursor:pointer;
-}
-.demo .video span.videoTitle {
-  font-size: 29px;
-  font-weight: 300;
-  padding: 3px 7px;
+
+.demo .video .circle {
+	font-size: 20px;
+	font-weight: 300;
+	background: white;
+	display: inline-block;
+	padding: 60px 20px;
+	border-radius: 230px;
 }
 
-.demo .video span.icon-ios7-play-outline:hover {
-  color:black;
+.demo .video .circle:hover {
+	background:black;
+	color:white;
+	cursor:pointer;
 }
 
+
 .box {
   display: table-cell;
   vertical-align: middle;
diff --git a/views/home.ejs b/views/home.ejs
index 5240ae1..8c7362c 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -16,9 +16,11 @@
 	<table class="demo">
 		<tr>
 			<td class="video" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
+				<span class="circle">
 				<span class="videoTitle">Create 3D Rooms</span><br>
-				<span class="icon-ios7-play-outline"></span><br>
+				<span class="icon-ios7-play"></span><br>
 				<span class="videoTitle">Watch video.</span>
+				</span>
 			</td>
 		</tr>
 	</table>
@@ -27,7 +29,7 @@
 	
 	[[ include projects/list-projects ]]
 	
-	<a href="#loadmore" class="viewMore">View More</a>
+	<a href="#loadmore" class="viewMore btn">View More</a>
 
 	[[ include partials/confirm-modal ]]	
 	[[ include projects/layouts-modal ]]	
-- 
cgit v1.2.3-70-g09d2


From 78630dc251eb179cb2b36de60979ebf323e7a2ba Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 29 Sep 2014 18:41:01 -0400
Subject: cleaner markup

---
 public/assets/stylesheets/app.css | 27 +++++++++++++--------------
 views/home.ejs                    | 10 ++++------
 2 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index fe50b92..17c79a7 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -167,7 +167,7 @@ h5 {
 .page.profile {
   color:white;
 }
-.page .demo,
+
 .page .profilepage,
 .page .projectList {
   width: 100%;
@@ -337,6 +337,8 @@ iframe.embed {
   font-size: 80px;
   font-weight: 100;
   padding-top: 25px;
+	float: left;
+	width: 100%;
 }
 
 /* DOCUMENTATION / ABOUT SECTION / FAQ PAGES */
@@ -398,15 +400,12 @@ iframe.embed {
 	z-index: 3;
 	position: relative;
   font-size: 18px;
-  padding: 8px;
-  margin: 4px;
-
 }
 .topLinks span {
   font-weight: 300;
 }
 .topLinks a {
-  padding: 8px;
+  padding: 20px 8px;
   color: black;
   font-weight: 300;
 	float:right;
@@ -690,7 +689,7 @@ iframe.embed {
 }
 .logo {
   float:left;
-  padding:10px;
+  padding:7px 0 0 10px;
   z-index:4;
   position:relative;
   -webkit-user-select: none;
@@ -1706,15 +1705,15 @@ form li textarea {
 	margin-top: 20px;
 }
 
-.demo .video {
-  height:80vh;
-  min-height:300px;
+.hero {
+	float:left;
+	width:100%;
+	clear:both;
+	height:70vh;
+	display:table;
 	background-size:cover;
-	border-bottom:1px solid;
 }
-
-
-.demo .video .circle {
+.hero .circle {
 	font-size: 20px;
 	font-weight: 300;
 	background: white;
@@ -1723,7 +1722,7 @@ form li textarea {
 	border-radius: 230px;
 }
 
-.demo .video .circle:hover {
+.hero .circle:hover {
 	background:black;
 	color:white;
 	cursor:pointer;
diff --git a/views/home.ejs b/views/home.ejs
index 8c7362c..e49dc4a 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -13,17 +13,15 @@
 	<div class="rapper page">
 	[[ include partials/header ]]
 
-	<table class="demo">
-		<tr>
-			<td class="video" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
+	<div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
+			<div class="holder">
 				<span class="circle">
 				<span class="videoTitle">Create 3D Rooms</span><br>
 				<span class="icon-ios7-play"></span><br>
 				<span class="videoTitle">Watch video.</span>
 				</span>
-			</td>
-		</tr>
-	</table>
+			</div>
+	</div>
 	
 	<h1>Room Showcase</h1>
 	
-- 
cgit v1.2.3-70-g09d2


From de93d0404ccb9ea7c9598293c7543620c8a85bb8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 29 Sep 2014 18:49:20 -0400
Subject: cursor on color picker

---
 .../assets/javascripts/ui/editor/LightControl.js   | 32 ++++++++++++----------
 public/assets/stylesheets/app.css                  | 15 ++++++++--
 views/controls/editor/light-control.ejs            |  3 ++
 3 files changed, 33 insertions(+), 17 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 96f6942..9c3cdd3 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -4,8 +4,7 @@ var LightControl = View.extend({
   
   events: {
     "mousedown": "stopPropagation",
-    "click .swatch": "clickSwatch",
-    "click label": "clickLabel",
+    "click .color-swatches span": "select",
     "input #shadow-control": "updateShadow",
     "mousedown #brightness-control": "beginBrightness",
     "input #brightness-control": "updateBrightness",
@@ -14,8 +13,10 @@ var LightControl = View.extend({
   },
   
   initialize: function(){
+
     this.colorPicker = new LabColorPicker(this, 180, 180)
-    this.$el.prepend( this.colorPicker.canvas )
+    this.$("#color-picker").append( this.colorPicker.canvas )
+    this.$("#color-picker").append( this.colorPicker.cursor )
     
     this.$swatches = this.$(".swatch")
     this.$labels = this.$(".swatch + label")
@@ -100,21 +101,16 @@ var LightControl = View.extend({
   setMode: function (mode) {
     var color, brightness
     this.mode = mode
-    this.$swatches.removeClass("selected")
-    this.$labels.removeClass("selected")
-    this.$swatch[ mode ].addClass("selected")
+    this.$(".active").removeClass("active")
+    this.$swatch[ mode ].parent().addClass("active")
     color = Walls.colors[ mode ]
     
-    this.$(".swatch.selected").next("label").addClass("selected")
     this.labColor = this.colorPicker.load(color)
     this.$brightnessControl.val( this.labColor[0] )
   },
   
-  clickLabel: function(e){
-    $(e.currentTarget).prev(".swatch").trigger("click")
-  },
-  clickSwatch: function(e){
-    var mode = $(e.currentTarget).data('mode')
+  select: function(e){
+    var mode = $('.swatch', e.currentTarget).data('mode')
     this.setMode(mode)
   },
   
@@ -138,8 +134,8 @@ var LabColorPicker = function (parent, w, h) {
   var imageData = ctx.createImageData(w,h)
   var data = imageData.data
 
-//   var cursor = this.cursor = document.createElement("div")
-//   cursor.className = "colorPickerCursor"
+  var cursor = this.cursor = document.createElement("div")
+  cursor.className = "colorPickerCursor"
 
   canvas.width = w
   canvas.height = h
@@ -182,6 +178,7 @@ var LabColorPicker = function (parent, w, h) {
     var x = mix( i/ww, a_range[0], a_range[1] )
     var y = mix( j/hh, b_range[0], b_range[1] )
     var rgb = xyz2rgb(hunterlab2xyz(val, x, y)).map(Math.round)
+    this.moveCursor(x,y)
     parent.pick( rgb, [val,x,y] )
   }
   this.load = function(rgba){
@@ -189,10 +186,15 @@ var LabColorPicker = function (parent, w, h) {
     var val = clamp( Lab[0], L_range[0], L_range[1] )
     var x = mix( norm(Lab[1], a_range[0], a_range[1]), 0, ww )
     var y = mix( norm(Lab[2], b_range[0], b_range[1]), 0, hh )
-    // move the cursor
+    
+    this.moveCursor(x,y)
     this.setLab(Lab)
     return Lab
   }
+  this.moveCursor = function(x,y){
+    cursor.style.left = x + "px"
+    cursor.style.top = y + "px"
+  }
   this.paint = function() {
     val = clamp(val, L_range[0], L_range[1])
     var x, y, t
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index fe50b92..8f22db5 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1262,9 +1262,20 @@ input[type="range"]::-webkit-slider-thumb {
   border-radius:10px;
   cursor:pointer;
 }
+#color-picker {
+  position: relative;
+}
 .colorPicker {
   cursor: crosshair;
 }
+.colorPickerCursor {
+  position: absolute;
+  width: 8px;
+  height: 8px;
+  border: 2px solid black;
+  border-radius: 50%;
+  margin-left: -4px;
+}
 
 .swatch {
   width: 20px;
@@ -1274,10 +1285,10 @@ input[type="range"]::-webkit-slider-thumb {
   cursor: pointer;
 	float:left;
 }
-.swatch:hover {
+span:hover .swatch {
 	border: 1px solid red;
 }
-.swatch.selected {
+.active .swatch {
   border: 1px solid #000;
 }
 .color-swatches {
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 65a602f..8b133a5 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,4 +1,7 @@
 <div class="vvbox lightcontrol">
+  <div id="color-picker">
+  </div>
+  
 	<div class="slider">
 		<h4>Brightness Control</h4>
 		<input type="range" min="0" max="110" value="0" id="brightness-control" />
-- 
cgit v1.2.3-70-g09d2


From dea374c2a0721a394ae5f041e8e324df4b5eb375 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 29 Sep 2014 18:56:17 -0400
Subject: fix color picker cursor lol

---
 public/assets/javascripts/ui/editor/LightControl.js | 4 +++-
 public/assets/stylesheets/app.css                   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 9c3cdd3..3eb2861 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -175,10 +175,12 @@ var LabColorPicker = function (parent, w, h) {
     return rgb
   }
   this.pick = function(i, j){
+    i = clamp(i, 0, w)
+    j = clamp(j, 0, h)
     var x = mix( i/ww, a_range[0], a_range[1] )
     var y = mix( j/hh, b_range[0], b_range[1] )
     var rgb = xyz2rgb(hunterlab2xyz(val, x, y)).map(Math.round)
-    this.moveCursor(x,y)
+    this.moveCursor(i, j)
     parent.pick( rgb, [val,x,y] )
   }
   this.load = function(rgba){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e136e03..39f9f1a 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1274,6 +1274,7 @@ input[type="range"]::-webkit-slider-thumb {
   border: 2px solid black;
   border-radius: 50%;
   margin-left: -4px;
+  margin-top: -4px;
 }
 
 .swatch {
-- 
cgit v1.2.3-70-g09d2


From 4a0717d5f8aa0ff3378ff589b106cd35c0586367 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 29 Sep 2014 19:31:25 -0400
Subject: outline walls on builder

---
 .../assets/javascripts/rectangles/engine/map/ui_editor.js  |  1 -
 .../assets/javascripts/rectangles/engine/rooms/_walls.js   | 14 ++++++++++++++
 .../assets/javascripts/rectangles/engine/rooms/builder.js  |  3 ++-
 public/assets/javascripts/ui/builder/BuilderInfo.js        |  1 +
 public/assets/javascripts/ui/builder/BuilderSettings.js    |  7 ++++++-
 public/assets/javascripts/ui/builder/BuilderView.js        |  5 +++++
 public/assets/javascripts/ui/site/LayoutsModal.js          |  1 +
 public/assets/stylesheets/app.css                          |  1 +
 server/lib/api/projects.js                                 |  8 ++++----
 9 files changed, 34 insertions(+), 7 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 9a557b9..f9334e6 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -38,7 +38,6 @@ Map.UI.Editor = function(map){
 			cursor.quantize(1/map.zoom)
 			map.center.a = cursor.x.a
 			map.center.b = -cursor.y.a
-			console.log(map.center+"")
 			cursor.x.b = cursor.x.a
 			cursor.y.b = cursor.y.a
 			base.mouse.down = false
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index f9eb9b7..82ccb87 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -88,6 +88,20 @@
 			})
     },
 		
+		base.paint = function(){
+      var wallColor = rgba_string(Walls.colors.wall, app.defaults.wallOpacity)
+      var outlineColor = rgb_string(Walls.colors.outline)
+      var floorColor = rgb_string(Walls.colors.floor)
+      var ceilingColor = rgb_string(Walls.colors.ceiling)
+      Walls.forEach(function(wall){
+        wall.outline(wallColor, outlineColor)
+      })
+      Rooms.forEach(function(room){
+        room.setFloorColor(floorColor)
+        room.setCeilingColor(ceilingColor)
+      })
+		}
+		
     base.setColor = {
     
       wall: function(rgb){
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index f0935d4..6a89158 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -44,9 +44,10 @@
 				base.clear()
 				base.build()
 				Rooms.grouper.build()
+				app.tube("rooms-built")
 			}
 		}
-		
+
 		base.build = function (){
 			Rooms.regions.forEach(function(region){
 				this.build_walls(region).forEach(function(el){
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 2fffdba..e6b7e97 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -55,6 +55,7 @@ var BuilderInfo = View.extend({
 		this.$height.unitVal( room.height )
 		this.$x.unitVal( room.rect.x.a )
 		this.$y.unitVal( room.rect.y.a )
+	  this.show()
 	},
 
 	destroy: function(room){
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 796c398..94eed29 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -9,7 +9,7 @@ var BuilderSettings = FormView.extend({
 	events: {
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
-		"click [data-role='save-layout']": 'save',
+		"click [data-role='save-layout']": 'clickSave',
 		"click [data-role='clone-layout']": 'clone',
 		"click [data-role='clear-layout']": 'clear',
 		"click [data-role='destroy-layout']": 'destroy',
@@ -118,6 +118,11 @@ var BuilderSettings = FormView.extend({
 		fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
 		return fd
 	},
+
+	clickSave: function(){
+    this.toggle(false)
+    this.save()
+	},
 	
 	success: function(data){
 		this.$id.val(data._id)
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index a89111f..81dce52 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -12,6 +12,11 @@ var BuilderView = View.extend({
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
+
+		app.on("rooms-built", function(){
+		  Walls.paint()
+		})
+
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 1bfc6cb..2449465 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -29,6 +29,7 @@ var LayoutsIndex = View.extend({
 			
 			this.$templates.append($span)
 		}.bind(this))
+		console.log(this.$templates.html())
 		this.show()
 	}
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 39f9f1a..ebc21a8 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -482,6 +482,7 @@ iframe.embed {
 .templates {
 	overflow: auto;
 	max-height: 80%;
+	width: 100%;
 }
 .no-templates {
 	display: none;
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index da41b48..61a6e10 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -21,10 +21,10 @@ var projects = {
 			}
 			else {
 				var name = util.sanitize(req.params.slug)
-				if (name == "new") {
-					name = ""
-				}
-				res.json({ _id: "new", name: name, isNew: true })
+        Project.count({}, function(err, count){
+          name = "Project #" + (count || 0)
+          res.json({ _id: "new", name: name, isNew: true })
+        })
 			}
 		})
 	},
-- 
cgit v1.2.3-70-g09d2