diff options
Diffstat (limited to 'public/assets')
| -rw-r--r-- | public/assets/javascripts/app.js | 3 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/site/HomeView.js | 3 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 51 |
3 files changed, 35 insertions, 22 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 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 */ |