summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-11-24 10:40:42 -0500
committerryderr <r@okfoc.us>2014-11-24 10:40:42 -0500
commitb506411d1b910fbf33591a394f555c241dcac62c (patch)
treeb3b04120f69ae6633c9f0e3e5a1cef0cd1c67ee7 /views
parentd4b057efd7f5d1dc92c95606ac9c6f75a2d88239 (diff)
parentd9697721355606f03a433327e5579606993b20e5 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views')
-rw-r--r--views/about/howto.ejs8
-rwxr-xr-xviews/home.ejs1
-rw-r--r--views/partials/meta.ejs1
-rw-r--r--views/partials/scripts.ejs4
-rw-r--r--views/reader.ejs5
5 files changed, 6 insertions, 13 deletions
diff --git a/views/about/howto.ejs b/views/about/howto.ejs
index 74009d1..5278a40 100644
--- a/views/about/howto.ejs
+++ b/views/about/howto.ejs
@@ -111,14 +111,6 @@
<tr><td>&nbsp;</td></tr>
<tr><td>Spacebar</td><td>Jump</td></tr>
</table>
- <style>
- .keyboard { float: left; width: 50%; }
- .keyboard tr { margin: 0; padding: 0; }
- .keyboard td { padding: 2px 10px; margin: 0; }
- .keyboard.first-keyboard td:nth-child(1) { text-align: center; width: 50px; padding-left: 100px; }
- .keyboard td:nth-child(1) { text-align: right; width: 150px; }
- .keyboard td:nth-child(2) { font-weight: 300; }
- </style>
</span>
</div>
</div>
diff --git a/views/home.ejs b/views/home.ejs
index 2c9c204..36fc2fc 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -82,6 +82,7 @@
<div class="holder">
<div class="video" style="width: 960px; margin: 0 auto; height: 540px; overflow: hidden; position: relative;"><iframe frameborder="0" scrolling="no" seamless="seamless" webkitallowfullscreen="webkitAllowFullScreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen" id="okplayer" src="http://player.vimeo.com/video/109947131?api=1&player_id=okplayer" width="960" height="540" style="width: 960px; height: 800px; margin-top: -130px;"></iframe></div>
</div>
+</div>
</body>
[[ include partials/scripts ]]
</html>
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index d22022c..673ab64 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -32,7 +32,6 @@
<link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic' rel='stylesheet' type='text/css'>
<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/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 7391d36..61659f7 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -5,13 +5,13 @@
<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script>
<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
-<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script>
+<!-- <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script> -->
<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/marked/lib/marked.js"></script>
<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/chardinjs.min.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>
<script type="text/javascript" src="/assets/javascripts/vendor/froogaloop.js"></script>
diff --git a/views/reader.ejs b/views/reader.ejs
index 363015b..6c9856a 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -27,8 +27,9 @@
[[ include partials/confirm-modal ]]
[[ include projects/layouts-modal ]]
[[ include partials/sign-in ]]
-<img src="/assets/img/keys.png" id="keyhint">
-<img src="/assets/img/360.png" id="threesixty">
+
+ <img src="/assets/img/keys.png" id="keyhint">
+ <img src="/assets/img/360.png" id="threesixty">
</body>
[[ include partials/scripts ]]
</html>