merge

2 files changed, 11 insertions, 2 deletions

diff --git a/public/assets/javascripts/ui/site/ProfileView.js b/public/assets/javascripts/ui/site/ProfileView.js
index f3b35d9..76d733c 100644
--- a/public/assets/javascripts/ui/site/ProfileView.js
+++ b/public/assets/javascripts/ui/site/ProfileView.js
@@ -1,6 +1,12 @@
 
 var ProfileView = View.extend({
 
+  el: ".profilepage",
+
+  events: {
+    "change #profile_avatar": "uploadAvatar",
+  },
+
 	initialize: function() {
 	},
 
@@ -12,6 +18,9 @@ var ProfileView = View.extend({
 		$(".bio").addClass(choice(classes));
 		
 		this.projectList = new ProjectList ()
+	},
+	
+	uploadAvatar: function(){
 	}
 
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index a15ea39..d6a231f 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -359,11 +359,11 @@ iframe.embed {
   height: 100%;
   text-align: center;
   overflow: hidden;
-	background-color: #ddd;
+  background-color: rgba(128,128,128,0.2);
   background-size: cover;
 }
 .projectList a:hover .room .mask {
-  background-color: rgba(238,238,238,0.1);
+  background-color: rgba(128,128,128,0.1);
 }
 .room .images {
   position: absolute;