merge

2 files changed, 161 insertions, 27 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index fbe9140..4637643 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -69,6 +69,10 @@ a{
 }
 #help-button {
   display: none;
+	border-right:0px!important;
+}
+.editProfile, .profileLink {
+	border-right:0px!important;
 }
 .editing #help-button {
   display: inline;
@@ -318,15 +322,6 @@ iframe.embed {
 	width: 100%;
 	height: 50vh;
 }
-.projectList .room:hover .holder{
-	background: rgba(255,255,255,0);
-}
-.projectList .holder{
-	background: rgba(255,255,255,0.7);
-	-webkit-transition:2s background;
-	-moz-transition:2s background;
-	transition:2s background;
-}
 
 .room .images {
   position: absolute;
@@ -365,7 +360,7 @@ iframe.embed {
 	vertical-align: middle;
 }
 
-.page .roomName {
+.page .room .holder a {
   font-weight: 300;
   font-size: 20px;
   letter-spacing: 1px;
@@ -379,7 +374,7 @@ iframe.embed {
   display: inline-block;
 }
 
-.page .roomName:hover {
+.page .room .holder a:hover {
   background:black;
   color:white;
 }
@@ -460,6 +455,10 @@ iframe.embed {
   font-size: 13px;
 }
 
+.footer a:hover{
+  text-decoration:underline;
+}
+
 
 /* PROFILE PAGE */
 .profilePic {
@@ -491,7 +490,7 @@ iframe.embed {
 	border-right:1px solid;
 }
 
-.topLinks a:last-child {
+.page .topLinks a:last-child {
 	border-right:0px solid;
 }
 .topLinks a:hover {
@@ -696,7 +695,12 @@ iframe.embed {
 .mx-object3d video {
 	pointer-events: none;
 }
-
+#keyhint {
+	position: fixed;
+	bottom:0;
+	right:0;
+	z-index: 2;
+}
 #hud {
 	position: fixed;
 	top:0;left:0;
@@ -762,8 +766,8 @@ iframe.embed {
 
 #minotaur {
 	position: absolute;
-	top: 0;
-	right: 230px;
+	top: 0px;
+	left: 150px;
 	opacity: 0;
 }
 #minotaur .label:after {
@@ -774,11 +778,11 @@ iframe.embed {
 #minotaur.saving {
 	padding: 20px 8px;
 	color: white;
-	background: black;
+	background: red;
 	font-weight: 300;
-	float: right;
 	text-decoration: none;
 	z-index: 33;
+  opacity: 1;
 }
 #minotaur.saving .label:after {
   content: 'SAVING';
@@ -1272,7 +1276,7 @@ iframe.embed {
 .wallpaper {
   right: 80px;
   margin-top: 77px;
-  width: 162px;
+  width: 172px;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   -webkit-transform: translateX(400px);
   transition: transform 0.1s ease-in-out;
@@ -1863,6 +1867,7 @@ form h3 {
 }
 #form_container {
   clear:both;
+	padding-bottom: 50px;
 }
 .errors {
 	display: none;
@@ -1913,6 +1918,8 @@ form li textarea {
 	-webkit-transition:0.2s all;
 	-moz-transition:0.2s all;
 	transition:0.2s all;
+  -webkit-transform: translate3d(0,-999px,0);
+          transform: translate3d(0,-999px,0);
 }
 
 .desktop .hero .circle:hover {
@@ -1920,7 +1927,11 @@ form li textarea {
 	color:white;
 	cursor:pointer;
 }
-
+.chardinjs-tooltiptext {
+	font-weight: 300;
+	line-height: 20px;
+	font-size: 16px;
+}
 
 .box {
   display: table-cell;
@@ -1949,8 +1960,10 @@ form li textarea {
 	border: 1px solid black;
 	box-shadow: -3px 4px black;
 	line-height: 75px;
+
 }
 
+
 .desktop .close:hover {
   background:black;
 	color:white;
@@ -2092,14 +2105,22 @@ a[data-role="forgot-password"] {
 
 /* COLLABORATORS */
 
-.collaborators > div {
-  width: 600px;
+.collaborators .rap {
+	display: table;
+	width: 100%;
+	height: 100%;
+}
+
+.collaborators .rap .holder .inner {
+  width: 480px;
   margin: 0 auto;
   text-align: left;
   background: white;
   padding: 10px;
   margin: 20px auto;
+position: relative;
 }
+
 .collaborators button {
   width: auto;
   position: relative;
@@ -2126,14 +2147,15 @@ a[data-role="forgot-password"] {
   border-color: black;
 }
 .collaborators p {
-  margin: 20px 0;
+	margin: 10px 0 20px;
+	font-weight: 300;
 }
 .collaborators form input[type=text] {
   font-size: 16px;
   width: 300px;
 }
 .collaborators h2 {
-  margin: 20px auto 10px;
+  margin: 20px auto 0;
 }
 #collaborator-list {
   margin-top: 20px;
@@ -2208,7 +2230,28 @@ a[data-role="forgot-password"] {
 	text-decoration: none;
 	font-size: 14px;
 	}
-
+	
+	.topLinks a[data-role="new-project-modal"], .topLinks a[data-role="show-layouts-modal"] {
+		display:none;
+	}
+	.close {
+	font-size: 40px;
+	right: 10px;
+	top: 10px;
+	width: 55px;
+	line-height: 55px;
+	}
+	form {
+	max-width: 90%;
+	
+	}
+	
+	form li {
+		font-size: 16px;
+	}
+	form input[type="text"], form input[type="password"] {
+	font-size: 15px;
+	}
 	.page h1 {
 	font-size: 26px;
 	padding: 10px 0 15px 0;
@@ -2236,11 +2279,19 @@ a[data-role="forgot-password"] {
 	}
 	.projectList.about {
 	text-align: center;
-	padding: 0;
+	padding: 20px 0;
 	}
 	.projectList.about .item .rap {
 	padding: 0;
 	}
+	.projectList.about .item span h3 {
+	font-weight: 500;
+	font-size: 18px;
+	margin-bottom: 6px;
+	}
+	.projectList.about .item:nth-child(2) span:nth-child(2) {
+		padding: 10px 0;
+	}
 	.projectList.about .item span:nth-child(1) {
 	width: 100%;
 	border-radius: 0;
@@ -2255,8 +2306,8 @@ a[data-role="forgot-password"] {
 	}
 	.page .viewMore.btn {
 	text-decoration: none;
-	font-size: 20px;
-	padding: 20px 0;
+	font-size: 18px;
+	padding: 18px 0;
 }
 .footer a, .footer span {
 margin: 9px;
diff --git a/public/assets/stylesheets/chardinjs.css b/public/assets/stylesheets/chardinjs.css
new file mode 100755
index 0000000..15334cf
--- /dev/null
+++ b/public/assets/stylesheets/chardinjs.css
@@ -0,0 +1,83 @@
+.chardinjs-overlay {
+  position: absolute;
+  z-index: 999999;
+  background-color: #000;
+  opacity: 0;
+  -webkit-transition: all 0.3s ease-out;
+  -moz-transition: all 0.3s ease-out;
+  -ms-transition: all 0.3s ease-out;
+  -o-transition: all 0.3s ease-out;
+  transition: all 0.3s ease-out; }
+
+.chardinjs-helper-layer {
+  position: absolute;
+  z-index: 9999998;
+  color: white;
+  -webkit-transition: all 0.3s ease-out;
+  -moz-transition: all 0.3s ease-out;
+  -ms-transition: all 0.3s ease-out;
+  -o-transition: all 0.3s ease-out;
+  transition: all 0.3s ease-out; }
+  .chardinjs-helper-layer.chardinjs-left {
+    border-left: solid white 1px;
+    margin-left: -10px; }
+  .chardinjs-helper-layer.chardinjs-right {
+    border-right: solid white 1px;
+    padding-right: 10px; }
+  .chardinjs-helper-layer.chardinjs-bottom {
+    border-bottom: solid white 1px;
+    padding-bottom: 10px; }
+  .chardinjs-helper-layer.chardinjs-top {
+    border-top: solid white 1px;
+    padding-top: 10px; }
+
+.chardinjs-tooltip {
+  position: absolute;
+  -webkit-transition: opacity 0.1s ease-out;
+  -moz-transition: opacity 0.1s ease-out;
+  -ms-transition: opacity 0.1s ease-out;
+  -o-transition: opacity 0.1s ease-out;
+  transition: opacity 0.1s ease-out;
+  max-width: 200px; }
+  .chardinjs-tooltip.chardinjs-left {
+    margin-left: -135px;
+    padding-right: 10px; }
+  .chardinjs-tooltip.chardinjs-right {
+    margin-right: -135px;
+    padding-left: 10px; }
+  .chardinjs-tooltip.chardinjs-bottom {
+    margin-bottom: -50px;
+    padding-top: 10px; }
+  .chardinjs-tooltip.chardinjs-top {
+    margin-top: -50px;
+    padding-bottom: 10px; }
+  .chardinjs-tooltip.chardinjs-right:before, .chardinjs-tooltip.chardinjs-left:after, .chardinjs-tooltip.chardinjs-bottom:before, .chardinjs-tooltip.chardinjs-top:after {
+    content: ".";
+    display: inline-block;
+    background-color: white;
+    height: 1px;
+    overflow: hidden;
+    position: absolute; }
+  .chardinjs-tooltip.chardinjs-right:before, .chardinjs-tooltip.chardinjs-left:after {
+    width: 100px;
+    top: 50%; }
+  .chardinjs-tooltip.chardinjs-bottom:before, .chardinjs-tooltip.chardinjs-top:after {
+    width: 1px;
+    height: 50px;
+    left: 50%; }
+  .chardinjs-tooltip.chardinjs-bottom:before {
+    top: -50px; }
+  .chardinjs-tooltip.chardinjs-top:after {
+    bottom: -50px; }
+  .chardinjs-tooltip.chardinjs-right:before {
+    left: -100px; }
+  .chardinjs-tooltip.chardinjs-left:after {
+    right: -100px; }
+
+.chardinjs-show-element {
+  z-index: 9999999;
+  opacity: 0.8; }
+/*
+.chardinjs-relative-position {
+  position: relative; }
+*/
\ No newline at end of file