merge

1 files changed, 55 insertions, 12 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index edd3928..90454be 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -8,6 +8,9 @@
 }
 body,textarea,input {
 	font-family: 'Lato', sans-serif;
+}
+
+.mobile input {
 	-webkit-appearance: none;
 }
 
@@ -21,6 +24,10 @@ body{
   overflow-x:hidden;
 }
 
+body.editing{
+  overflow:hidden;
+}
+
 ::-moz-selection { 
     color: white;
     background: black;
@@ -776,6 +783,21 @@ iframe.embed {
 .profilepage .about h2:nth-child(2){
 	margin:34px 0;
 }
+.profilepage .about h2 a.homeLink {
+  background: white;
+  border: 1px solid black;
+  padding: 10px;
+}
+.profilepage .about h2 a.homeLink:hover {
+  background: black;
+  border: 1px solid black;
+  color: white;
+}
+.profilepage .about h3 {
+  font-size: 13px;
+  font-weight: 300;
+  text-align: center;
+}
 .about {
 	background-color: #ffffff;background-image:url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScyODkuNScgaGVpZ2h0PScyODkuNScgdmlld0JveD0nMCAwIDI4OS41IDI4OS41Jz4KCTxkZWZzPgoJCTxwYXR0ZXJuIGlkPSdibHVlc3RyaXBlJyBwYXR0ZXJuVW5pdHM9J3VzZXJTcGFjZU9uVXNlJyB4PScwJyB5PScwJyB3aWR0aD0nNTcuOScgaGVpZ2h0PSc1Ny45JyB2aWV3Qm94PScwIDAgMTE1LjggMTE1LjgnID4KCQk8cmVjdCB3aWR0aD0nMTEwJScgaGVpZ2h0PScxMTAlJyBmaWxsPScjZmZmZmZmJy8+CgkJCTxwYXRoIGQ9J00xLDFoMTE1Ljh2MTE1LjhoLTExNS44di0xMTUuOCcgZmlsbC1vcGFjaXR5PScwJyBzdHJva2Utd2lkdGg9JzAuOCcgc3Ryb2tlLWRhc2hhcnJheT0nMCwxLDEnIHN0cm9rZT0nI2NjY2NjYycvPgoJCTwvcGF0dGVybj4gCgkJPGZpbHRlciBpZD0nZnV6eicgeD0nMCcgeT0nMCc+CgkJCTxmZVR1cmJ1bGVuY2UgdHlwZT0ndHVyYnVsZW5jZScgcmVzdWx0PSd0JyBiYXNlRnJlcXVlbmN5PScuMiAuMycgbnVtT2N0YXZlcz0nNScgc3RpdGNoVGlsZXM9J3N0aXRjaCcvPgoJCQk8ZmVDb2xvck1hdHJpeCB0eXBlPSdzYXR1cmF0ZScgaW49J3QnIHZhbHVlcz0nMCcvPgoJCTwvZmlsdGVyPgoJPC9kZWZzPgoJPHJlY3Qgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScgZmlsbD0ndXJsKCNibHVlc3RyaXBlKScvPgo8cmVjdCB3aWR0aD0nMTAwJScgaGVpZ2h0PScxMDAlJyBmaWx0ZXI9J3VybCgjZnV6eiknIG9wYWNpdHk9JzAnLz4KPC9zdmc+Cg==');
 	background-attachment: fixed;
@@ -1107,7 +1129,7 @@ border-left: 1px solid black;
   width: 55px;
 }
 
-.menu span:hover{
+.desktop .menu span:hover{
   color:white;
   background:black;
   cursor:pointer;
@@ -1129,7 +1151,7 @@ border-left: 1px solid black;
 	content: "\f12a" !important;
 }
 
-.menu span:hover:after{
+.desktop .menu span:hover:after{
   content: attr(data-info);
   position: absolute;
   color: black;
@@ -1738,17 +1760,29 @@ input[type="range"]::-webkit-slider-thumb {
 .floodMessage {
   display: none;
   animation: flicker 0.2s infinite;
+	-webkit-animation: flicker 0.2s infinite;
+	-moz-animation: flicker 0.2s infinite;
   color: black;
   float: left;
   margin: 10px 5px 5px 5px;
-  font-size: 13px;
-  font-weight: 300;
+  font-size: 10px;
   text-align: center;
+	font-weight:600;
+	color:red;
+	text-transform:uppercase;
+	text-align:left;
+}
+.floodMessage:before {
+	content:"CLICK ON WALL OR ";
 }
 @keyframes flicker {
-  49% { color: black; }
-  50% { color: red; }
-  100% { color: red; }
+  50% { opacity:0.7; }
+}
+@-webkit-keyframes flicker {
+   50% { opacity:0.7; }
+}
+@-moz-keyframes flicker {
+   50% { opacity:0.7; }
 }
 
 #color-picker {
@@ -2316,11 +2350,16 @@ form li textarea {
 	display: inline-block;
 	padding: 60px 20px;
 	border-radius: 230px;
-	-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);
+	opacity:1;
+	-webkit-transition:0.2s background;
+	-moz-transition:0.2s background;
+	transition:0.2s background;
+	position: relative;
+	z-index: 5;
+}
+
+.loading .hero .circle {
+	opacity:0;
 }
 
 .desktop .hero .circle:hover {
@@ -2786,6 +2825,10 @@ a[data-role="forgot-password"] {
 	.footer {
 		padding:50px 0 120px 0;
 	}
+	.videoModal .ion-ios7-close-empty {
+	right: 10px;
+	top: 20px;
+	}
 }
 
 @media screen and (orientation:portrait) {