From 23a4b54b995c1c07fcde48eadae90454bfaf212e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Nov 2014 17:15:23 -0500
Subject: fix player

---
 views/home.ejs   | 1 +
 views/reader.ejs | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'views')

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/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>
-- 
cgit v1.2.3-70-g09d2


From d9697721355606f03a433327e5579606993b20e5 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Nov 2014 17:36:50 -0500
Subject: removing chardinjs, prefixfree

---
 Gruntfile.js                      | 2 --
 public/assets/stylesheets/app.css | 8 ++++++++
 views/about/howto.ejs             | 8 --------
 views/partials/meta.ejs           | 1 -
 views/partials/scripts.ejs        | 4 ++--
 5 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'views')

diff --git a/Gruntfile.js b/Gruntfile.js
index 59c2525..68828e0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,12 +12,10 @@ module.exports = function(grunt) {
           "public/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js",
           "public/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js",
           "public/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js",
-          "public/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js",
           "public/assets/javascripts/vendor/bower_components/marked/lib/marked.js",
           "public/assets/javascripts/vendor/tube.js",
           "public/assets/javascripts/vendor/loader.js",
           "public/assets/javascripts/vendor/polyfill.js",
-          "public/assets/javascripts/vendor/chardinjs.min.js",
           "public/assets/javascripts/vendor/sha1.js",
           "public/assets/javascripts/vendor/dataUriToBlob.js",
           "public/assets/javascripts/vendor/froogaloop.js",
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9500b3b..201819d 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2900,6 +2900,14 @@ a[data-role="forgot-password"] {
   100%{height:500px;top:2px;}
 }
 
+/* KEYBOARD SHORTCUTS */
+
+.keyboard { float: left; width: 50%; margin-top: 50px; }
+.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; }
 
 /* MOBILE */
 
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/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>
-- 
cgit v1.2.3-70-g09d2