some css, set bg to white when noclipping into void

7 files changed, 17 insertions, 18 deletions

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 71ddde9..7ff472d 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -137,7 +137,7 @@
 
         $("#header").toggleClass("black", luminance < 128)
         $("body").css("background-color", rgbColor)
-        
+                
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 5c7b4af..98f80c5 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -21,13 +21,6 @@ Rooms.mover = new function(){
 	base.update = function(pos){
 		var radius = scene.camera.radius
 		
-		if (base.noclip) {
-			cam.x = pos.x
-			cam.y = pos.y
-			cam.z = pos.z
-			return
-		}
-		
 		cam.y = pos.y
 
 		// if we were in a room already..
@@ -42,14 +35,15 @@ Rooms.mover = new function(){
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(pos.x, pos.z, radius)
 
-			if (collision) {
+			if (collision && ! base.noclip) {
 				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
 				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
 				return
 			}
 
 			// in this case, we appear to have left the room..
-			$(".face.active").removeClass("active")
+			// $(".face.active").removeClass("active")
+			$("body").css("background-color", "transparent")
 			base.room = null
 		}
 
@@ -65,6 +59,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
+			$("body").css("background-color", rgb_string( Walls.colors.wall ))
       app.tube("change-room", { room: base.room })
 		}
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6aab60c..a15ea39 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -482,6 +482,9 @@ iframe.embed {
 	width: 100%;
 	border-top: 1px solid;
 }
+.page h1:nth-child(2) {
+	margin-top: 40px;
+}
 
 .page p {
 	margin: 20px;
diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
index aa21f9b..c75a9b1 100644
--- a/public/assets/stylesheets/staff.css
+++ b/public/assets/stylesheets/staff.css
@@ -28,15 +28,16 @@ nav {
   text-align: left;
 }
 nav a {
-  padding-left: 20px;
+  margin-left: 20px;
 }
 hr {
   border: 1px solid #bbb;
-  margin: 5px auto 10px;
+  margin: 10px auto 10px;
+  background: transparent;
 }
 .body {
   width: 80%;
-  margin: 0 auto;
+  margin: 40px auto;
 }
 .json {
   display: none;
@@ -63,6 +64,8 @@ hr {
 .staff {
   font-size: 15px;
 }
+.staff .body a {
+}
 .staff .editLinks a {
   color: #00f;
 }
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 1b547ef..fe2c988 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -86,7 +86,7 @@ views.home = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
@@ -151,7 +151,7 @@ views.profile = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
diff --git a/views/docs.ejs b/views/docs.ejs
index 5662133..665190d 100644
--- a/views/docs.ejs
+++ b/views/docs.ejs
@@ -8,8 +8,6 @@
 <div class="rapper page docs">
 	[[ include partials/header ]]
 
-	<br clear="all">
-	
 	[[ if (! isNew) { ]]
 		<h1>[[- doc.displayName ]]</h1>
 
diff --git a/views/home.ejs b/views/home.ejs
index e02ab0c..16b00e7 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -10,7 +10,7 @@
 	</script>
 </head>
 <body class="loading">
-	<div class="rapper page">
+	<div class="rapper page home">
 	[[ include partials/header ]]
 
 	<div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">