merge

3 files changed, 38 insertions, 11 deletions

diff --git a/public/assets/javascripts/ui/site/ProfileView.js b/public/assets/javascripts/ui/site/ProfileView.js
index 76d733c..8471abc 100644
--- a/public/assets/javascripts/ui/site/ProfileView.js
+++ b/public/assets/javascripts/ui/site/ProfileView.js
@@ -21,6 +21,25 @@ var ProfileView = View.extend({
 	},
 	
 	uploadAvatar: function(){
+    var fd = new FormData(), hasCSRF = false
+    var files = this.$("#profile_avatar")[0].files
+    if (! files.length) return
+    
+    fd.append("avatar", files[0]);
+    fd.append("_csrf", $("[name=_csrf]").val())
+
+    var request = $.ajax({
+      url: "/api/profile",
+      type: "put",
+      data: fd,
+      dataType: "json",
+      processData: false,
+      contentType: false,
+    })
+
+    request.done($.proxy(function (response) {
+      window.location.href = "/profile"
+    }, this));
 	}
 
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d6a231f..fc7512a 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -332,18 +332,16 @@ iframe.embed {
 
 
 .projectList a {
-	width: 32vw;
-	float:left;
-	clear: right;
-	padding-bottom: 2vw;
+	padding: 4%;
+	display: inline-block;
 }
 .projectList .room {
-	width: 30vw;
-	height: 23vw;
+	width: 22vw;
+	height: 17vw;
 	margin: 1vw 1vw 0 1vw;
-	display:table;
+	display: table;
 	position: relative;
-  z-index: 1;
+	z-index: 1;
 }
 .projectList .holder {
   position: absolute;
@@ -359,8 +357,9 @@ iframe.embed {
   height: 100%;
   text-align: center;
   overflow: hidden;
-  background-color: rgba(128,128,128,0.2);
-  background-size: cover;
+	background-color: rgba(128,128,128,0.1);
+	background-size: contain;
+	background-position: center;
 }
 .projectList a:hover .room .mask {
   background-color: rgba(128,128,128,0.1);
@@ -429,7 +428,7 @@ iframe.embed {
 	text-decoration: none;
 	display: inline-block;
 	cursor: pointer;
-	border: 1px solid transparent;
+	border: 1px solid black;
 	line-height: 18px;
 	padding:0 5px;
 }
@@ -502,6 +501,12 @@ iframe.embed {
 	margin: 0 auto;
 	display: block;
 }
+.docs a {
+  border-bottom: 1px dashed;
+}
+.docs #header a, .docs .footer a {
+  border-bottom: 0;
+}
 
 .docs .options {
 	margin: 50px auto 0 auto;
@@ -673,6 +678,7 @@ iframe.embed {
 	
 }
 .profilepage .about h2 .btn {
+  float: none;
 	border: 1px solid;
 	font-weight: 500;
 	padding: 10px;
diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
index c75a9b1..720eb0a 100644
--- a/public/assets/stylesheets/staff.css
+++ b/public/assets/stylesheets/staff.css
@@ -65,9 +65,11 @@ hr {
   font-size: 15px;
 }
 .staff .body a {
+  border-bottom: 1px dotted;
 }
 .staff .editLinks a {
   color: #00f;
+  border-bottom: 1px solid;
 }
 #iframe-embed, #iframe-embed tr, #iframe-embed td {
   width: 79vw;