merge

1 files changed, 276 insertions, 125 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 17a7dc0..ebc21a8 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -6,6 +6,9 @@
 	outline:0;
 	font-family: 'Lato', sans-serif;
 	-webkit-font-smoothing: subpixel-antialiased;
+	-webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
 }
 *, *:before, *:after {
   moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
@@ -164,26 +167,19 @@ h5 {
 .page.profile {
   color:white;
 }
-.page table.demo,
-.page table.profilepage,
-.page table.projectList {
+
+.page .profilepage,
+.page .projectList {
   width: 100%;
-  border-top: 1px solid;
   margin: 40px 0 0 0;
   border-spacing: 0;
   clear: both;
 }
-.page table.profilepage tr,
-.page table.projectList tr {
-  height: 400px;
-}
-.page table.showcase {
+
+.page .showcase {
   height:70vh;
 }
-.page table.projectList td.border {
-	position: relative;
-  border-right: 1px solid;
-}
+
 iframe.embed {
 	width: 100%;
 	height: 100%;
@@ -194,34 +190,43 @@ iframe.embed {
 	z-index: -1;
 	pointer-events: none;
 }
-.page table.demo td,
-.page table.profilepage td,
-.page table.projectList td {
+.projectList {
+	display: inline-block;
+	float: left;
+	width: 100%;
+}
+.projectList .room {
   width: 33.3333%;
-  background-size: cover;
-  background-repeat: no-repeat;
-  background-position: center;
-  border-bottom:1px solid black;
+	height:40vh;
+	display:table;
+	position: relative;
+	float:left;
+	border-top:1px solid black;
+}
+.projectList .room:nth-child(4n+1){
+	width:100%;
 }
+.page .btn {
+	clear: both;
+	padding: 30px 0;
+	border: 0;
 
-.page table.showcase td {
-  height: 70vh;
-  background-size: cover;
 }
 
-.viewMore {
-  color: #017cfe;
+.page .viewMore {
   text-decoration: none;
-  font-weight: 300;
   font-size: 22px;
-  padding-top: 20px;
   display: block;
-  border-bottom: 1px solid black;
-  padding-bottom: 19px;
+	border-top: 1px solid black;
+	border-bottom: 1px solid black;
 }
 
-.viewMore:hover {
-  text-decoration:underline;
+
+.holder {
+	display: table-cell;
+	height: 100%;
+	width: 100%;
+	vertical-align: middle;
 }
 
 .page .roomName {
@@ -305,22 +310,15 @@ iframe.embed {
   padding:80px;
 }
 .subButtons a {
-  margin: 9px 0;
-  border: 0;
-  background: transparent;
-  font-size: 15px;
-  font-weight: 300;
-  width: 33.33333333333%;
   display: inline-block;
   float: left;
-  text-decoration:none;
 }
-.subButtons a:hover {
-  text-decoration:underline;
+
+.subButtons a:nth-child(2){
+ margin-left:5px;
 }
 .subButtons a:nth-child(3){
- color:#FF3A2D; 
- float: right;
+ float:right;
 }
 .page .questions span{
   font-weight:300;
@@ -339,6 +337,8 @@ iframe.embed {
   font-size: 80px;
   font-weight: 100;
   padding-top: 25px;
+	float: left;
+	width: 100%;
 }
 
 /* DOCUMENTATION / ABOUT SECTION / FAQ PAGES */
@@ -367,8 +367,9 @@ iframe.embed {
 }
 
 .footer {
-  width: 100%;
-  margin: 80px 0;
+	width: 100%;
+	padding: 80px 0;
+	background: #f9f9f9;
 }
 
 .footer a, .footer span{
@@ -388,7 +389,8 @@ iframe.embed {
   margin-right: 10px;
   color: black;
   font-weight: 100;
-  text-decoration: none
+  text-decoration: none;
+	padding: 50px 0 100px 0;
 }
 .editProfile span {
   vertical-align: middle;
@@ -398,24 +400,21 @@ iframe.embed {
 	z-index: 3;
 	position: relative;
   font-size: 18px;
-  padding: 8px;
-  margin: 14px;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
 }
 .topLinks span {
   font-weight: 300;
 }
 .topLinks a {
-  padding: 8px;
+  padding: 20px 8px;
   color: black;
   font-weight: 300;
+	float:right;
   text-decoration: none;
   border-bottom:1px solid transparent;
 }
 .topLinks a:hover {
-  border-bottom:1px solid lightgreen;
+	background: black;
+	color: white;
 }
 .profilepage .bio {
   text-align: left;
@@ -483,6 +482,7 @@ iframe.embed {
 .templates {
 	overflow: auto;
 	max-height: 80%;
+	width: 100%;
 }
 .no-templates {
 	display: none;
@@ -499,6 +499,18 @@ iframe.embed {
   display: inline-block;
   margin: 4vw;
   border:1px solid white;
+  position: relative;
+}
+
+.templates span:after {
+  content: attr(data-name);
+  position: absolute;
+  top: 100%;
+  width: 100%;
+  left: 0;
+  background: #fff;
+  padding: 5px;
+  border-top: 1px solid black;
 }
 
 .templates span:hover {
@@ -652,7 +664,7 @@ iframe.embed {
 
 #minotaur {
   position: absolute;
-  top: 26px;
+  top: 25px;
   right: 260px;
   opacity: 0;
 }
@@ -662,8 +674,11 @@ iframe.embed {
   font-weight: 300;
 }
 #minotaur.saving {
-  background: #8fd;
+  background: white;
   opacity: 1;
+  z-index: 20;
+  font-size: 13px;
+  border: 1px solid;
 }
 #minotaur.saving .label:after {
   content: 'SAVING';
@@ -675,7 +690,7 @@ iframe.embed {
 }
 .logo {
   float:left;
-  padding:10px;
+  padding:7px 0 0 10px;
   z-index:4;
   position:relative;
   -webkit-user-select: none;
@@ -705,6 +720,9 @@ iframe.embed {
   display: inline-block;
   background: white;
   box-shadow: -3px 3px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
 }
 
 .edit-video.menu,
@@ -1002,7 +1020,7 @@ iframe.embed {
 }
 
 .editBtn:hover {
- background:lightgreen;
+ background:black;
 }
 
 .deleteArmed .mediaDrawer h3 {
@@ -1213,6 +1231,12 @@ iframe.embed {
   transform: translateX(400px);
   transition: -webkit-transform 0.2s ease-in-out;
 }
+.lightcontrol h4 {
+	font-weight: 600;
+	font-size: 12px;
+	line-height: 0;
+	margin-top: 15px;
+}
 .lightcontrol.active {
   -webkit-transform: translateX(0px);
   transform: translateX(0px);
@@ -1238,34 +1262,73 @@ input[type="range"]::-webkit-slider-thumb {
   border-radius:10px;
   cursor:pointer;
 }
+#color-picker {
+  position: relative;
+}
 .colorPicker {
   cursor: crosshair;
 }
+.colorPickerCursor {
+  position: absolute;
+  width: 8px;
+  height: 8px;
+  border: 2px solid black;
+  border-radius: 50%;
+  margin-left: -4px;
+  margin-top: -4px;
+}
+
 .swatch {
   width: 20px;
   height: 20px;
-  border: 1px solid black;
+  border: 1px solid #eee;
   display: inline-block;
   cursor: pointer;
+	float:left;
+}
+span:hover .swatch {
+	border: 1px solid red;
 }
-.swatch.selected {
-  border-width: 2px;
+.active .swatch {
+  border: 1px solid #000;
 }
 .color-swatches {
   margin-top: 10px;
 }
+.color-swatches span {
+	display: inline-block;
+	width: 50%;
+	float:left;
+	cursor:pointer;
+}
+.color-swatches span:nth-child(1),.color-swatches span:nth-child(2){
+	margin-bottom:5px;
+}
+.color-swatches span.active{
+	background:red;
+	color:white;
+}
+.color-swatches span:nth-child(3){
+	clear:left;
+}
+.color-swatches span:hover {
+	background:#eee;
+}
+
+.color-swatches span.active:hover {
+	background:red;
+}
 .color-swatches label {
-  font-size: 11px;
-  font-weight: 300;
-  position: relative;
-  top: -6px;
-  padding-left: 5px;
-  display: inline-block;
-  min-width: 35px;
-  cursor: pointer;
+	font-size: 14px;
+	font-weight: 300;
+	position: relative;
+	padding-left: 5px;
+	display: inline-block;
+	cursor: pointer;
+	top: -2px;
 }
-.color-swatches label.selected {
-  font-weight: 500;
+.color-swatches span.active label {
+  font-weight: 600;
 }
 
 
@@ -1353,6 +1416,10 @@ input[type="range"]::-webkit-slider-thumb {
 .settings .setting {
   margin-bottom:10px;
 }
+.settings
+.settings .setting a {
+	text-decoration:none;
+}
 .setting.subButtons {
   display: inline-block;
   width: 100%;
@@ -1360,10 +1427,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 .settings .subButtons a {
   font-size: 12px;
-  font-weight: 300;
-  width: 40px;
-  margin: 0;
 }
+
 .settings .setting:last-child{
   margin-bottom:0px;
 }
@@ -1382,6 +1447,10 @@ input[type="range"]::-webkit-slider-thumb {
 	float: left;
 	position: relative;
 	top: 5px;
+	font-weight:600;
+}
+.setting.number label:after {
+	content:":";
 }
 .setting.number.halflines {
 	height: 30px;
@@ -1446,22 +1515,45 @@ input[type="range"]::-webkit-slider-thumb {
 	padding-right: 3px;
 }
 
+.btn, button {
+	background:white;
+	color:black;
+	padding:3px;
+	text-decoration:none;
+	 cursor: pointer;
+	border:1px solid;
+}
+
+.btn:hover, button:hover {
+  background:black;
+  color:white;
+}
+.btn.marg {
+	margin-top:10px;
+}
+.warn {
+	background:red;
+	display: inline-block;
+	color:white;
+	text-decoration:none;
+	border:1px solid red;
+	text-align: center;
+}
+
 button {
   padding: 8px;
-  border: 1px solid;
   float: right;
   font-weight: 500;
-  background: white;
-  cursor: pointer;
   width: 100%;
+	font-size:14px;
 }
 
-button:hover {
-  background:black;
-  color:white;
+#builder-units {
+	width:100%;
+}
+#mediaEditor .warn {
+	width:100%;
 }
-
-
 
 .radio-group {  
   width: 182px;
@@ -1469,6 +1561,7 @@ button:hover {
   table-layout: fixed;
   border-spacing: 0;
   border-collapse: separate;
+	overflow:hidden;
 }
 
 .radio-group__label {
@@ -1478,7 +1571,7 @@ button:hover {
   vertical-align: middle;
   text-align: center;
   position: relative;
-  border: 1px solid #ccc;
+  border: 1px solid #000;
   cursor:pointer;
   border-style: solid none solid solid;
  /* border-radius: 5px 0 0 5px;*/
@@ -1491,19 +1584,19 @@ button:hover {
 }
   
 .radio-group__label + input + .radio-group__label:before {
-  content: " ";
-  display: block;
-  position: absolute;
-  top:-1px;
-  width: 100%;
-  height: 100%;
-  border: 1px solid #000;
-  /*border-radius: 5px 0 0 5px;*/
-  -webkit-transform: translate3d(-103%,0,0);
-  -webkit-transition: all 250ms;
-  transform: translate3d(-103%,0,0);
-  transition: all 250ms;
-  background:;
+	content: " ";
+	display: block;
+	position: absolute;
+	top: 0px;
+	width: 94px;
+	height: 100%;
+	border: 0;
+	/* border-radius: 5px 0 0 5px; */
+	-webkit-transform: translate3d(-103%,0,0);
+	-webkit-transition: all 250ms;
+	transform: translate3d(-103%,0,0);
+	transition: all 250ms;
+	background: rgba(0,0,0,0.1);
 }  
 
 .radio-group__label + input:checked + .radio-group__label:before {
@@ -1528,6 +1621,24 @@ form {
 form div {
 	float:right;
 }
+form div.hidden {
+	height: 0;
+	overflow: hidden;
+}
+form h3.link {
+	content:"?";
+}
+form h3.link:after {
+	content:"?";
+}
+
+form h3.link:hover {
+	color:#017cfe;
+	cursor:pointer;
+}
+
+
+
 form li {
 	font-size: 20px;
 	font-weight: 300;
@@ -1554,9 +1665,9 @@ form input[type="submit"] {
 	padding: 10px 0;
 }
 form input[type="submit"]:hover {
-	background:lightgreen;
+	background:black;
 	color:white;
-	border:1px solid lightgreen;
+	border:1px solid black;
 	cursor:pointer;
 }
 form p{
@@ -1607,45 +1718,62 @@ form li textarea {
 	margin-top: 20px;
 }
 
-.demo .video {
-  height:80vh;
-  min-height:300px;
-}
-
-.demo .video span {
-  font-size:100px;
-  color:white;
-  cursor:pointer;
+.hero {
+	float:left;
+	width:100%;
+	clear:both;
+	height:70vh;
+	display:table;
+	background-size:cover;
 }
-.demo .video span.videoTitle {
-  font-size: 29px;
-  font-weight: 300;
-  padding: 3px 7px;
+.hero .circle {
+	font-size: 20px;
+	font-weight: 300;
+	background: white;
+	display: inline-block;
+	padding: 60px 20px;
+	border-radius: 230px;
 }
 
-.demo .video span.icon-ios7-play-outline:hover {
-  color:lightgreen;
+.hero .circle:hover {
+	background:black;
+	color:white;
+	cursor:pointer;
 }
 
+
 .box {
   display: table-cell;
   vertical-align: middle;
   width: 100%;
 }
+.question {
+	font-size: 43px;
+	font-weight: 300;
+	margin-bottom: 10px;
+	display: inline-block;
+}
 
 .close {
-  font-weight: 100;
-  font-size: 120px;
-  float: right;
-  cursor: pointer;
-  position: fixed;
-  right: 20px;
-  top: 20px;
-  z-index: 20;
+	font-weight: 100;
+	font-size: 70px;
+	float: right;
+	cursor: pointer;
+	position: fixed;
+	right: 20px;
+	top: 20px;
+	z-index: 20;
+	background: #f9f9f9;
+	width: 75px;
+	color: black;
+	border: 1px solid black;
+	box-shadow: -3px 4px black;
+	line-height: 75px;
 }
 
 .close:hover {
-  color:lightgreen;
+  background:black;
+	color:white;
 }
 
 
@@ -1664,7 +1792,7 @@ form li textarea {
 }
 /*
 .facebook:hover{
-  background:lightgreen;
+  background:black;
 }
 */
 .box b.signin-tagline {
@@ -1673,6 +1801,8 @@ form li textarea {
   margin-bottom: 18px;
   font-weight: 500;
   font-size: 12px;
+	border-bottom: 1px solid #444;
+	padding-bottom: 20px;
   letter-spacing: 2px;
 }
 .facebook b {
@@ -1680,6 +1810,11 @@ form li textarea {
   font-size: 50px;
 }
 
+a[data-role="forgot-password"] {
+	font-size:11px;
+	margin-top:10px;
+}
+
 .facebook span {
   vertical-align: bottom;
   padding-right: 14px;
@@ -1697,6 +1832,14 @@ form li textarea {
   border: 1px solid;
 }
 
+.aboutRoom h1 {
+	font-size:28px;
+}
+.txt {
+	font-size:12px;
+	padding:5px 0;
+	display: inline-block;
+}
 .aboutRoom h1 a{
   text-decoration: none;
   font-style: italic;
@@ -1707,14 +1850,22 @@ form li textarea {
 }
 
 .aboutRoom .editlink {
-  color: red;
-  text-decoration: none;
-  border-bottom: 1px dotted;
+	border-bottom: 0;
+	padding: 6px;
+	display: inline-block;
+	margin-top: 10px;
+	width: 100%;
+	text-align: center;
+}
+
+.aboutRoom .editlink:hover {
+	background:black;
+	color:white;
 }
 
 .aboutRoom h2{
   font-size: 13px;
-  margin: 5px 0;
+  margin: 5px 0 0 0;
 }
 
 .share {