merge

1 files changed, 161 insertions, 63 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6e23962..a15ea39 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -10,7 +10,7 @@ body,textarea,input {
 	font-family: 'Lato', sans-serif;
 }
 input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
-	background:white;
+	background:white!important;
 }
 *, *:before, *:after {
   moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
@@ -246,6 +246,11 @@ h5 {
 	display: inline-block;
 }
 
+.projectList {
+	border-top: 1px solid;
+}
+
+
 .projectList.about {
 	text-align: left;
 	border-top: 1px solid;
@@ -324,30 +329,42 @@ iframe.embed {
 	z-index: -1;
 	pointer-events: none;
 }
-.projectList {
-	display: inline-block;
-	float: left;
-	width: 100%;
-}
 
+
+.projectList a {
+	width: 32vw;
+	float:left;
+	clear: right;
+	padding-bottom: 2vw;
+}
 .projectList .room {
-  width: 50%;
-	height:40vh;
+	width: 30vw;
+	height: 23vw;
+	margin: 1vw 1vw 0 1vw;
 	display:table;
 	position: relative;
-	float:left;
-	border-top:1px solid;
+  z-index: 1;
 }
-
-.projectList .room:nth-child(3n+2) {
-	border-right:1px solid black;
+.projectList .holder {
+  position: absolute;
+  top: 50%;
+  z-index: 2;
 }
 
-.projectList .room:nth-child(3n+1) {
-	width: 100%;
-	height: 50vh;
+.room .mask {
+  position: absolute;
+  top: 0; left: 0;
+  z-index: 1;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  overflow: hidden;
+	background-color: #ddd;
+  background-size: cover;
+}
+.projectList a:hover .room .mask {
+  background-color: rgba(238,238,238,0.1);
 }
-
 .room .images {
   position: absolute;
   top: 0; left: 0;
@@ -357,16 +374,36 @@ iframe.embed {
   text-align: center;
   overflow: hidden;
 }
-.room .images img {
-  max-height: 100%;
-  max-width: 100%;
+.room .images div {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-size: cover;
+  background-position: center center;
 }
 
+/*
+.room .images[data-mediacount='1'] img:nth-child(1) { left: 20%; top: 20%; }
+
+.room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 40%; }
+.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 50%; width: auto; height: 40%; }
+
+.room .images[data-mediacount='3'] img:nth-child(1) { right: 51%; bottom: 41%; }
+.room .images[data-mediacount='3'] img:nth-child(2) { right: 51%; top: 61%; }
+.room .images[data-mediacount='3'] img:nth-child(3) { left: 51%; bottom: 0%; width:auto; height:30%;}
+
+.room .images[data-mediacount='4'] img:nth-child(1) { right: 51%; bottom: 41%; }
+.room .images[data-mediacount='4'] img:nth-child(2) { left: 51%; bottom: 61%; }
+.room .images[data-mediacount='4'] img:nth-child(3) { right: 51%; top: 61%; }
+.room .images[data-mediacount='4'] img:nth-child(4) { left: 51%; top: 41%; }
+*/
+
 .page .btn {
 	clear: both;
 	padding: 30px 0;
 	border: 0;
-
 }
 
 .page .viewMore {
@@ -385,18 +422,16 @@ iframe.embed {
 	vertical-align: middle;
 }
 
-.page .room .holder a {
-  font-weight: 300;
-  font-size: 20px;
-  letter-spacing: 1px;
-  color: black;
-  background: white;
-  border: 1px solid;
-  padding: 5px;
-  box-shadow: -3px 3px black;
-  text-decoration:none;
-  max-width: 180px;
-  display: inline-block;
+.page .projectList label {
+	font-weight: 600;
+	font-size: 12px;
+	color: black;
+	text-decoration: none;
+	display: inline-block;
+	cursor: pointer;
+	border: 1px solid transparent;
+	line-height: 18px;
+	padding:0 5px;
 }
 
 .page .room .holder a:hover {
@@ -404,6 +439,11 @@ iframe.embed {
   color:white;
 }
 
+.projectList a:hover label {
+  background:black;
+	color:white;
+}
+
 
 .page .questions {
   background: #55efcb;
@@ -437,11 +477,14 @@ iframe.embed {
 .page h1 {
 	font-size: 80px;
 	font-weight: 100;
-	padding: 60px 0 25px 0;
+	padding: 20px 0 25px 0;
 	float: left;
 	width: 100%;
 	border-top: 1px solid;
 }
+.page h1:nth-child(2) {
+	margin-top: 40px;
+}
 
 .page p {
 	margin: 20px;
@@ -476,6 +519,8 @@ iframe.embed {
 	width: 100%;
 	padding: 80px 0;
 	background: #f9f9f9;
+	float: left;
+	clear: both;
 }
 
 .footer a, .footer span{
@@ -499,6 +544,10 @@ iframe.embed {
 	display:table;
 }
 
+.noPic {
+	border-right: 1px solid;
+}
+
 .profilePic .ion-ios7-person-outline {
 	font-size: 100px;
 }
@@ -610,47 +659,86 @@ iframe.embed {
 
 .profilepage .bio span:last-of-type:after { display: none; }
 
+.profilepage .about h2 {
+	text-align: center;
+	font-weight: 300;
+	font-size: 32px;
+}
+.profilepage .about h2:nth-child(2){
+	margin:34px 0;
+}
+.about {
+	background-color: #ffffff;background-image:url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScyODkuNScgaGVpZ2h0PScyODkuNScgdmlld0JveD0nMCAwIDI4OS41IDI4OS41Jz4KCTxkZWZzPgoJCTxwYXR0ZXJuIGlkPSdibHVlc3RyaXBlJyBwYXR0ZXJuVW5pdHM9J3VzZXJTcGFjZU9uVXNlJyB4PScwJyB5PScwJyB3aWR0aD0nNTcuOScgaGVpZ2h0PSc1Ny45JyB2aWV3Qm94PScwIDAgMTE1LjggMTE1LjgnID4KCQk8cmVjdCB3aWR0aD0nMTEwJScgaGVpZ2h0PScxMTAlJyBmaWxsPScjZmZmZmZmJy8+CgkJCTxwYXRoIGQ9J00xLDFoMTE1Ljh2MTE1LjhoLTExNS44di0xMTUuOCcgZmlsbC1vcGFjaXR5PScwJyBzdHJva2Utd2lkdGg9JzAuOCcgc3Ryb2tlLWRhc2hhcnJheT0nMCwxLDEnIHN0cm9rZT0nI2NjY2NjYycvPgoJCTwvcGF0dGVybj4gCgkJPGZpbHRlciBpZD0nZnV6eicgeD0nMCcgeT0nMCc+CgkJCTxmZVR1cmJ1bGVuY2UgdHlwZT0ndHVyYnVsZW5jZScgcmVzdWx0PSd0JyBiYXNlRnJlcXVlbmN5PScuMiAuMycgbnVtT2N0YXZlcz0nNScgc3RpdGNoVGlsZXM9J3N0aXRjaCcvPgoJCQk8ZmVDb2xvck1hdHJpeCB0eXBlPSdzYXR1cmF0ZScgaW49J3QnIHZhbHVlcz0nMCcvPgoJCTwvZmlsdGVyPgoJPC9kZWZzPgoJPHJlY3Qgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScgZmlsbD0ndXJsKCNibHVlc3RyaXBlKScvPgo8cmVjdCB3aWR0aD0nMTAwJScgaGVpZ2h0PScxMDAlJyBmaWx0ZXI9J3VybCgjZnV6eiknIG9wYWNpdHk9JzAnLz4KPC9zdmc+Cg==');
+	background-attachment: fixed;
+	
+}
+.profilepage .about h2 .btn {
+	border: 1px solid;
+	font-weight: 500;
+	padding: 10px;
+	font-size: 18px;
+}
+.profilepage .about h2 .btn:hover {
+	background:black;
+	color:white;
+}
 .templates {
 	overflow: auto;
-	max-height: 80%;
+	max-height: 100%;
 	width: 100%;
+	padding: 20px 0 40px 0;
+}
+.templates-list {
+	display: inline-block;
+	width: 100%;
+	margin-bottom: 40px;
+}
+.templates::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+}
+
+.templates::-webkit-scrollbar-thumb {
+background-color: white;
+border-left: 1px solid black;
+}
+
+.templates::-webkit-scrollbar-track {
+	background-color: transparent;
 }
+
 .no-templates {
 	display: none;
 }
 
-.templates span{
+.templates span {
+	display: block;
+	float: left;
+	margin: 1vw 0;
+	padding: 2vw;
+	cursor: pointer;
+}
+.templates span .image {
   background-position: center;
-  background-size: contain;
-  background-repeat: no-repeat;
+  background-size: cover;
   background-color: #fff;
   width: 20vw;
-  height: 20vh;
-  display: inline-block;
-  margin: 4vw;
-  border:1px solid black;
-  position: relative;
+  height: 15vw;
+  display: block;
+  background-color: #ddd;
 }
 
-.templates span:after {
-	content: attr(data-name);
-	position: absolute;
-	top: 100%;
+.templates span label {
 	width: 100%;
 	left: 0;
-	background: #fff;
-	padding: 5px;
-	border-top: 1px solid black;
+  display: block;
 	font-weight: 300;
 }
 
-.templates span:hover {
-  border:1px solid blue;
-  cursor:pointer;
-}
 
-.templates span:hover:after {
-	border-top: 1px solid blue;
+.templates span:hover .image {
+  background-color: #f00;
+  cursor:pointer;
 }
 
 .templates h1 {
@@ -1000,10 +1088,13 @@ iframe.embed {
 .mediaDrawer {
   -webkit-transform:translateY(-100%);
   transform:translateY(-100%);
-  background:rgba(255,255,255,0.9);
+  background:white;
   text-align:center;
   overflow-x: hidden;
 }
+.editing .mediaDrawer {
+	background:rgba(255,255,255,0.95);
+}
 .mediaDrawer.active {
   -webkit-transform:translateY(0%);
   transform:translateY(0%);
@@ -1091,7 +1182,7 @@ iframe.embed {
   left: 50%;
   padding: 26px 20px;
   margin-left: -200px;
-  background: rgba(255,255,255,0.9);
+  background: rgba(255,255,255,0.99);
   z-index: 7;
   -webkit-transform: translateY(-1000%);
   -webkit-transition: -webkit-transform 0.6s ease-in-out;
@@ -1123,7 +1214,7 @@ iframe.embed {
   border: 1px solid #ccc;
   font-size: 15px;
   padding: 5px;
-  width: 220px;
+  width: 290px;
   text-align: center;
   border-radius: 20px;
 }
@@ -1215,8 +1306,6 @@ iframe.embed {
   color:white;
 }
 
-.deleteArmed .mediaContainer {
-}
 
 .deleteArmed .mediaContainer:hover {
   background:#FF3B30;
@@ -1272,12 +1361,11 @@ iframe.embed {
 
 
 .mediaContainer {
-  border: 1px solid white;
   display: inline-block;
   width: 25%;
   margin: 4%;
   vertical-align: top;
-  border:1px solid white;
+  border:1px solid transparent;
   padding:2%;
 }
 .mediaContainer:hover {
@@ -1589,6 +1677,7 @@ input[type="range"]::-webkit-slider-thumb {
 .settings.info {
   right: auto;
   left: 10px;
+  width: 230px;
 }
 
 .vvbox h4 {
@@ -1669,6 +1758,7 @@ input[type="range"]::-webkit-slider-thumb {
   font-size: 12px;
   width: 100%;
   max-height: 200px;
+	max-width: 100%;
 }
 #textEditor.settings textarea {
   max-height: none;
@@ -1895,6 +1985,8 @@ form div.hidden {
 }
 form h3.link {
 	content:"?";
+	margin-top: 0;
+	padding: 0 0 10px 0;
 }
 form h3.link:after {
 	content:"?";
@@ -2256,6 +2348,7 @@ a[data-role="forgot-password"] {
   background-size: cover;
   display: inline-block;
   margin-right: 10px;
+	background-color: #ccc;
 }
 #collaborator-list .username {
   position: relative;
@@ -2362,6 +2455,11 @@ a[data-role="forgot-password"] {
 	width: 50%;
 	height: 180px;
 	}
+	.profilepage .about h2 {
+	text-align: center;
+	font-weight: 500;
+	font-size: 17px;
+	}
 	.projectList.about {
 	text-align: center;
 	padding: 20px 0;