summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-11-05 11:33:51 -0500
committerryderr <r@okfoc.us>2014-11-05 11:33:51 -0500
commit80c731a0d0f10db6891364ecd0cf3afcee288cb1 (patch)
tree460af3e08a0809336022f103cc8e7e75685113dd
parent39d502a7609da3ada15be163b8400994c9edecd6 (diff)
copy
-rw-r--r--public/assets/javascripts/app.js1
-rwxr-xr-xpublic/assets/stylesheets/app.css6
-rw-r--r--views/controls/editor/settings.ejs4
-rwxr-xr-xviews/home.ejs10
-rw-r--r--views/partials/footer.ejs2
-rw-r--r--views/partials/meta.ejs2
-rw-r--r--views/partials/scripts.ejs2
7 files changed, 16 insertions, 11 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 c190f35..2303d3e 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2339,6 +2339,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 {
@@ -2808,6 +2810,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 8443abb..0d8f325 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">
<a href="#" class="modalLink" data-role='show-collaborators'>
diff --git a/views/home.ejs b/views/home.ejs
index 85a235b..56ac3f9 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,18 +37,18 @@
</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>
<span>
<h3>Defy The Status Quo</h3>
- <words>There is no platform on the internet quite like VValls. Built using advanced HTML5 techniques, VValls opens up the possibilities of expression online. Go crazy, make other worldly rooms.</words>
+ <words>There is no platform on the internet quite like VValls. VValls opens up the possibilities of expression online. Go crazy, make other worldly rooms.</words>
</span>
</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>