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

7 files changed, 15 insertions, 10 deletions

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 0488f11..b4eb9e6 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -8,7 +8,6 @@ else if ($.browser.msie || ! has3d()) {
 }
 else {
  $("html").addClass("desktop");
-  new WOW().init()
 }
 
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 7b8dd26..90454be 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2354,6 +2354,8 @@ form li textarea {
 	-webkit-transition:0.2s background;
 	-moz-transition:0.2s background;
 	transition:0.2s background;
+	position: relative;
+	z-index: 5;
 }
 
 .loading .hero .circle {
@@ -2823,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) {
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 197ad43..cd17382 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -10,9 +10,9 @@
 			<span class="ion-ios7-navigate-outline"></span>
 			<span id="startText">Set Startpoint</span>
 			<span id="moveText">Move to Desired Point <span class="done">done</span></span>
-			<span id="confirmText">Startpoint Confirmed</span>
+			<span id="confirmText">Set Startpoint</span>
 		</a>
-    <a href="#" class="modalLink" id="goText"><span>(go there)</span></span>
+    <a href="#" class="modalLink" id="goText"><span><u>view current</u></span></span>
 	</div>
 	
 	<div class="setting">
diff --git a/views/home.ejs b/views/home.ejs
index bc54250..0a55336 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -15,7 +15,7 @@
 
 	<div class="hero" style="background-image:url(http://okfocus.s3.amazonaws.com/images/vvalls-video-still1.jpg)">
 			<div class="holder">
-				<span class="circle wow bounceInDown">
+				<span class="circle">
 				<span class="videoTitle">Create 3D Rooms</span><br>
 				<span class="ion-ios7-play"></span><br>
 				<span class="videoTitle">Watch video.</span>
@@ -26,7 +26,7 @@
 	<h1>What's VValls For?</h1>
 	
 	<div class="projectList about">
-		<div class="item wow bounceInLeft">
+		<div class="item">
 			<div class="rap">
 			<span style="background-image:url(http://okfocus.s3.amazonaws.com/images/hangart1.gif)">
 			</span>
@@ -37,7 +37,7 @@
 		</div>
 	</div>
 		
-		<div class="item wow bounceInRight">
+		<div class="item">
 			<div class="rap">
 			<span style="background-image:url(http://dump.fm/images/20100904/1283618382861-dumpfm-timb-paperrad.paranoia.gif)">
 			</span>
@@ -48,7 +48,7 @@
 		</div>
 		</div>
 		
-		<div class="item wow bounceInLeft">
+		<div class="item">
 			<div class="rap">
 			<span style="background-image:url(http://33.media.tumblr.com/tumblr_m0an31XPpF1qbhp9xo1_1280.jpg)">
 			</span>
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
index 3ee4afc..f44b611 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -11,7 +11,7 @@
 	<br><br>
 	
 	<span>
-		you are signed in as &rarr;
+		signed in as &rarr;
 		<a href="/profile/[[- user.username ]]"><b>[[- user.displayName ]]</b></a>
 		[[ if (user.isStaff) { ]]
 		<a href="/staff">Staff Area</a>
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index c50fc01..f1b6f48 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -30,7 +30,7 @@
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
 	<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>
 	<link href='/assets/stylesheets/app.css' rel='stylesheet' type='text/css'>
-	<link href='/assets/stylesheets/animate.css' rel='stylesheet' type='text/css'>
+	<!--<link href='/assets/stylesheets/animate.css' rel='stylesheet' type='text/css'>-->
 	<link href='/assets/stylesheets/chardinjs.css' rel='stylesheet' type='text/css'>
 	<!--[if lt IE 9]>
 	<style>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index af16099..3e61a5a 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -7,7 +7,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>
-<script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script>
+<!--<script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script>-->
 <script type="text/javascript" src="/assets/javascripts/vendor/chardinjs.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/dataUriToBlob.js"></script>