summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gruntfile.js2
-rw-r--r--public/assets/javascripts/app.js3
-rw-r--r--public/assets/javascripts/ui/site/HomeView.js3
-rwxr-xr-xpublic/assets/stylesheets/app.css51
-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
9 files changed, 41 insertions, 37 deletions
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/javascripts/app.js b/public/assets/javascripts/app.js
index 5620cdc..01a2e54 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -1,10 +1,9 @@
if (is_mobile) {
- // window.location.href = "mobile.html"
$("html").addClass("mobile");
}
else if ($.browser.msie || ! has3d()) {
- // window.location.href = "error.html"
+ $("html").addClass("fallback");
}
else {
$("html").addClass("desktop");
diff --git a/public/assets/javascripts/ui/site/HomeView.js b/public/assets/javascripts/ui/site/HomeView.js
index 404a491..a04bac1 100644
--- a/public/assets/javascripts/ui/site/HomeView.js
+++ b/public/assets/javascripts/ui/site/HomeView.js
@@ -7,7 +7,8 @@ var HomeView = View.extend({
load: function() {
this.projectList = new ProjectList ()
- var player = $f( okplayer )
+ var iframe = $("#okplayer")[0]
+ var player = $f( iframe )
player.addEvent('ready', function(){
player.addEvent('play', function(){
player.api('setVolume', 1.0)
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 707d43c..e26df00 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1278,22 +1278,24 @@ border-left: 1px solid black;
background: black;
}
.animate {
- -webkit-transition:all 0.2s ease-in-out;
- transform:translateY(-100%);
+ -webkit-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+ -webkit-transform: translateY(-100%);
+ transform: translateY(-100%);
}
.mediaDrawer {
- -webkit-transform:translateY(-100%);
- transform:translateY(-100%);
- background:white;
- text-align:center;
+ -webkit-transform: translateY(-100%);
+ transform: translateY(-100%);
+ background: white;
+ text-align: center;
overflow-x: hidden;
}
.editing .mediaDrawer {
background:rgba(255,255,255,0.95);
}
.mediaDrawer.active {
- -webkit-transform:translateY(0%);
- transform:translateY(0%);
+ -webkit-transform: translateY(0%);
+ transform: translateY(0%);
}
.mediaDrawer.table, .mediaDrawer.error,
.mediaDrawer.signin, .mediaDrawer.signup,
@@ -1374,7 +1376,7 @@ border-left: 1px solid black;
cursor:text;
}
-.fileUpload{
+.fileUpload {
position: fixed;
width: 400px;
text-align: center;
@@ -1388,14 +1390,14 @@ border-left: 1px solid black;
-webkit-transform: translateY(-1000%);
-webkit-transition: -webkit-transform 0.6s ease-in-out;
transform: translateY(-1000%);
- transition: -webkit-transform 0.6s ease-in-out;
+ transition: transform 0.6s ease-in-out;
border: 1px solid;
box-shadow: -3px 3px black;
}
.fileUpload.active {
- -webkit-transform:translateY(0%);
- transform:translateY(0%);
+ -webkit-transform: translateY(0%);
+ transform: translateY(0%);
}
.fileUpload .ion-ios7-upload-outline {
@@ -1593,12 +1595,12 @@ border-left: 1px solid black;
-moz-user-select: none;
user-select: none;
}
-#minimap.hide{
+#minimap.hide {
-webkit-transform: translateY(155px);
transform: translateY(155px);
}
-#minimap.hide canvas{
- opacity:0;
+#minimap.hide canvas {
+ opacity: 0;
}
#minimap canvas {
display: block;
@@ -1620,9 +1622,9 @@ border-left: 1px solid black;
}
.reader #minimap.active {
- -webkit-transform:translateX(0px);
- -moz-transform:translateX(0px);
- transform:translateX(0px);
+ -webkit-transform: translateX(0px);
+ -moz-transform: translateX(0px);
+ transform: translateX(0px);
left: auto;
}
@@ -2546,11 +2548,14 @@ form li textarea {
}
#fixed_close {
display: none;
+ -webkit-transform: translateY(-200px) translateZ(0);
transform: translateY(-200px) translateZ(0);
}
#fixed_close.active {
- animation:0.2s transform linear 1s;
+ -webkit-transition: 0.2s -webkit-transform linear 1s;
+ transition: 0.2s transform linear 1s;
display: block;
+ -webkit-transform: translateY(0px) translateZ(0);
transform: translateY(0px) translateZ(0);
}
@@ -2894,6 +2899,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/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>
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 18:14:24 +0000