fix player

5 files changed, 31 insertions, 24 deletions

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 b4b07b5..4676eea 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1279,22 +1279,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,
@@ -1375,7 +1377,7 @@ border-left: 1px solid black;
   cursor:text;
 }
 
-.fileUpload{
+.fileUpload {
   position: fixed;
   width: 400px;
   text-align: center;
@@ -1389,14 +1391,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 {
@@ -1594,12 +1596,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;
@@ -1621,9 +1623,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;
 }
 
@@ -2547,11 +2549,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);
 }
 
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>