Merge branch 'master' of github.com:okfocus/vvalls

4 files changed, 46 insertions, 8 deletions

diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 7268b32..8ada237 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -10,7 +10,7 @@ var HelpCursor = View.extend({
 	  addmedia: "Great, now click a wall to place this image.",
 	  resize: "Drag the image to position it, or use the dots to resize.",
 	  presets: "These are some basic presets to get you started. Click em! :-)",
-	  wallpaper: "Drag the wallpaper onto the walls, floor, and ceiling.",
+	  wallpaper: "Click the wallpaper you want then apply it to the walls. Feel free to upload your own too!",
 	  colors: "Use these colors to change the color of the walls, floor, and ceiling.",
 	  settings: "This is where you publish your project. Give it a name, hit save, and you'll have a URL you can share with your friends.",
 	},
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d7876da..ef49350 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -153,6 +153,27 @@ a{
 	font-size: 24px;
 	padding: 18px 27px 0 8px;
 }
+@-moz-keyframes redpulse {
+	50%{
+		color:#f24444;
+	}
+}
+@keyframes redpulse {
+	50%{
+		color:#f24444;
+	}
+}
+@-webkit-keyframes redpulse {
+	50%{
+		color:#f24444;
+	}
+}
+
+.topLinks a.ion-help-circled.active {
+	-webkit-animation:1s redpulse infinite linear;
+	-moz-animation:1s redpulse infinite linear;
+	animation:1s redpulse infinite linear;
+}
 .topLinks a.ion-help-circled.active,
 .topLinks a.ion-help-circled:hover {
 	background:transparent;
@@ -916,6 +937,7 @@ border-left: 1px solid black;
 	position: fixed;
 	bottom:0;
 	right:0;
+	pointer-events:none;
 	z-index: 2;
 }
 #hud {
@@ -1108,6 +1130,7 @@ border-left: 1px solid black;
   margin-top: -16px;
   font-size: 13px;
 	font-family:'Lato', sans-serif;
+	font-weight:600;
 }
 
 .menu span.ion-ios7-sunny-outline:hover:after {
@@ -1347,6 +1370,14 @@ border-left: 1px solid black;
 	font-weight: 300;
 }
 
+.mediaDrawer form h2{
+	font-size: 22px;
+	display: inline-block;
+	position: relative;
+	z-index: 4;
+	margin-bottom: 20px;
+}
+
 .mediaDrawer.mediaViewer h2 {
 	margin-top:28px;
 	font-size:18px;
@@ -1824,17 +1855,15 @@ input[type="range"]::-webkit-slider-thumb {
   position: fixed;
   max-width: 200px;
   font-size: 15px;
-  color: black;
-  background: rgba(255,255,255,0.9);
+  color: white;
+  background: rgba(255,0,0,0.8);
   margin: 8px 0 0 8px;
   padding: 10px;
   font-weight: 600;
   z-index: 22;
   display: none;
-	margin-left:-210px;
+	margin-left:-220px;
 	margin-bottom:20px;
-	border:1px solid;
-	box-shadow:3px 3px black;
 }
 
 .settings.info {
@@ -1873,7 +1902,10 @@ input[type="range"]::-webkit-slider-thumb {
 .modalLink:hover span {
   text-decoration: underline;
 }
-
+.settings .name {
+	display: block;
+	margin-top: 10px;
+}
 @-webkit-keyframes fade {
   50% {
     opacity:0.6;
@@ -2465,6 +2497,7 @@ a[data-role="forgot-password"] {
 .share h2 {
 	font-weight: 400;
 	font-size: 13px;
+	margin:0;
 }
 
 .share a{
diff --git a/views/home.ejs b/views/home.ejs
index 85548fb..85a235b 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -28,7 +28,7 @@
 	<div class="projectList about">
 		<div class="item wow bounceInLeft">
 			<div class="rap">
-			<span style="background-image:url(http://www.articlesweb.org/blog/wp-content/gallery/artist-painting-techniques-you-must-know/artist-painting-techniques-you-must-know-15.jpg)">
+			<span style="background-image:url(http://okfocus.s3.amazonaws.com/images/hangart1.gif)">
 			</span>
 			<span>
 				<h3>Plan Your Art Show</h3>
diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs
index 08c9e99..0d36a1d 100644
--- a/views/partials/sign-in.ejs
+++ b/views/partials/sign-in.ejs
@@ -3,7 +3,10 @@
 <div class="mediaDrawer fixed animate signin">
 	<span class="close">X</span>
 	<div class="box">
+		
 		<form id="signIn" method="post">
+			<h2>Sign in</h2>
+			
 			<input type="hidden" name="_csrf" value="[[- token ]]">
 			<a href="/auth/facebook" class="facebook"><b class="ion-social-facebook"></b><span>Sign in with Facebook</span></a>
 			<b class="signin-tagline">– or with your email –</b>
@@ -37,6 +40,8 @@
 	<span class="close">X</span>
 	<div class="box">
 		<form id="signUp" method="post">
+			<h2>Sign up</h2>
+			
 			<input type="hidden" name="_csrf" value="[[- token ]]">
 			<a href="/auth/facebook" class="facebook"><b class="ion-social-facebook"></b><span>Sign up with Facebook</span></a>
 			<b class="signin-tagline">– or with your email –</b>