merge

1 files changed, 50 insertions, 16 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index ef49350..6e42050 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -302,6 +302,7 @@ h5 {
 
 .page {
   text-align:center;
+	background:#f9f9f9;
 }
 
 .page.profile {
@@ -327,6 +328,7 @@ h5 {
 	text-align: left;
 	border-top: 1px solid;
 	padding:10% 0;
+	margin-bottom:20px;
 }
 
 .projectList.about .item{
@@ -749,6 +751,11 @@ iframe.embed {
 	font-weight: 300;
 	float: left;
 	clear: both;
+	max-width: 100%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: inline-block;
 }
 
 .profilepage .bio span:last-of-type:after { display: none; }
@@ -842,9 +849,6 @@ border-left: 1px solid black;
   margin: 0;
 }
 
-.templates span.active {
-  border:1px solid #017cfe;
-}
 
 .clear:after {
 	visibility: hidden;
@@ -1156,7 +1160,7 @@ border-left: 1px solid black;
 }
 
 .fixed::-webkit-scrollbar {
-  width: 3px;  
+  width: 3px;
 }
 
 .fixed::-webkit-scrollbar-track {
@@ -2632,7 +2636,15 @@ a[data-role="forgot-password"] {
 		width: 70px;
 		height: 37px;
 	}
-	
+	.video {
+		width: 100%!important;
+		height: auto!important;
+	}
+	.video iframe {
+		width: 100%!important;
+		height: auto!important;
+		margin-top: 0!important;
+	}
 	.topLinks a {
 	padding: 12px 8px;
 	color: black;
@@ -2685,23 +2697,36 @@ a[data-role="forgot-password"] {
 	.profilepage .bio {
 	height: 180px;
 	width: 50%;
+	display: inline-block;
+	padding-top: 20px;
 	}
-	.profilepage .bio h2 {
-		font-weight: 300;
-		font-size: 30px;
-	}
+
 	.profilePic {
 	width: 50%;
 	height: 180px;
 	}
 	.profilepage .about h2 {
-	text-align: center;
-	font-weight: 500;
-	font-size: 17px;
+		display:none;
+	}
+	.profilepage .projectList.about:after {
+		content:"In order to create a room in VValls you need to use a desktop or laptop computer.. Its totally worth though!";
+		margin:20px 0 10px 0;
+		font-size:22px;
+		display:inline-block;
+		width:100%;
+		padding:10px;
+		line-height: 34px;
+	}
+	.bio .holder {
+		display: inline-block;
+	}
+	.page .projectList label {
+		font-weight:600;
+		border:0;
 	}
 	.projectList.about {
 	text-align: center;
-	padding: 20px 0;
+	padding: 0px 0;
 	}
 	.projectList.about .item .rap {
 	padding: 0;
@@ -2717,7 +2742,7 @@ a[data-role="forgot-password"] {
 	.projectList.about .item span:nth-child(1) {
 	width: 100%;
 	border-radius: 0;
-	height: 150px;
+	height: 160px;
 	}
 	.projectList.about .item span:nth-child(2) {
 	width: 100%;
@@ -2732,7 +2757,7 @@ a[data-role="forgot-password"] {
 		padding: 18px 0;
 	}
 	.footer a, .footer span {
-	margin: 9px;
+	margin: 4px;
 	}
 	#keyhint {
 		display:none;
@@ -2743,7 +2768,13 @@ a[data-role="forgot-password"] {
 	}
 	.projectList .room {
 		width: 100%;
-		height: 260px;
+		height: 280px;
+		margin: 0;
+	}
+	.mediaDrawer form h2 {
+		margin-bottom: 26px;
+		width: 100%;
+		text-align: left;
 	}
 	.aboutRoom {
 		width: 170px;
@@ -2756,6 +2787,9 @@ a[data-role="forgot-password"] {
 	.aboutRoom h1 a, .aboutRoom h1 {
 		font-size: 16px;
 	}
+	.footer {
+		padding:50px 0 120px 0;
+	}
 }
 
 @media screen and (orientation:portrait) {