merge

1 files changed, 69 insertions, 38 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 76196be..0062dca 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -327,27 +327,42 @@ iframe.embed {
 .projectList {
 	display: inline-block;
 	float: left;
-	width: 100%;
+	width: 98vw;
+	margin: 2vw;
 }
 
+.projectList a {
+	width: 32vw;
+	float:left;
+	clear: right;
+	padding-bottom: 2vw;
+}
 .projectList .room {
-  width: 50%;
-	height:40vh;
+	width: 30vw;
+	height: 23vw;
+	margin: 1vw;
+	border: 1vw solid white;
 	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-size: cover;
+  background-repeat: no-repeat;
 }
-
 .room .images {
   position: absolute;
   top: 0; left: 0;
@@ -358,15 +373,28 @@ iframe.embed {
   overflow: hidden;
 }
 .room .images img {
-  max-height: 100%;
-  max-width: 100%;
+  width: 50%;
+  position: absolute;
 }
 
+.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: 100%; }
+.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 0%; width: auto; height: 100%; }
+
+.room .images[data-mediacount='3'] img:nth-child(1) { right: 51%; bottom: 41%; }
+.room .images[data-mediacount='3'] img:nth-child(2) { left: 51%; bottom: 0%; width:auto; height:100%;}
+.room .images[data-mediacount='3'] img:nth-child(3) { right: 51%; top: 61%; }
+
+.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 +413,15 @@ iframe.embed {
 	vertical-align: middle;
 }
 
-.page .room .holder a {
-  font-weight: 300;
-  font-size: 20px;
-  letter-spacing: 1px;
+.page label {
+  font-weight: 500;
+  font-size: 15px;
   color: black;
-  background: white;
-  border: 1px solid;
   padding: 5px;
-  box-shadow: -3px 3px black;
   text-decoration:none;
-  max-width: 180px;
   display: inline-block;
+  cursor: pointer;
+  border: 1px solid transparent;
 }
 
 .page .room .holder a:hover {
@@ -404,6 +429,10 @@ iframe.embed {
   color:white;
 }
 
+.projectList a:hover label {
+  border: 1px solid black;
+}
+
 
 .page .questions {
   background: #55efcb;
@@ -664,36 +693,38 @@ border-left: 1px solid black;
 }
 
 .templates span {
+  display: block;
+  float: left;
+  background: white;
+  margin: 2vw;
+  padding: 2vw;
+  cursor:pointer;
+}
+.templates span .image {
   background-position: center;
   background-size: contain;
   background-repeat: no-repeat;
   background-color: #fff;
-	width: 15vw;
-	height: 14vw;
-  display: inline-block;
-  margin: 4vw;
+  width: 20vw;
+  height: 15vw;
+  display: block;
   background-color: #ddd;
-  position: relative;
 }
 
-.templates span:after {
-	content: attr(data-name);
-	position: absolute;
-	top: 100%;
+.templates span label {
 	width: 100%;
 	left: 0;
-	background: #fff;
-	padding: 5px;
+  display: block;
 	font-weight: 300;
 }
 
-.templates span:hover {
+.templates span:hover,
+.templates span:hover .image {
   background-color: #f00;
   cursor:pointer;
 }
-
-.templates span:hover:after {
-  color: #f00;
+.templates span:hover label {
+  color: white;
 }
 
 .templates h1 {