summaryrefslogtreecommitdiff
path: root/public/assets
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-19 14:45:29 -0500
committerJules Laplace <jules@okfoc.us>2014-11-19 14:45:29 -0500
commit63cf79fbcc981d81abdf3d22c30e1bf757e10987 (patch)
tree29995d1643cafb427d5bd979767f51222d00364a /public/assets
parentb226be83665b0bf060a013f2fd006b0982f58270 (diff)
parent4a456e58d8544b949b8bf60fb7dfb4b5f62a7c70 (diff)
merge
Diffstat (limited to 'public/assets')
-rw-r--r--public/assets/javascripts/ui/site/HomeView.js3
-rwxr-xr-xpublic/assets/stylesheets/app.css2
2 files changed, 4 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/site/HomeView.js b/public/assets/javascripts/ui/site/HomeView.js
index ba2ead3..404a491 100644
--- a/public/assets/javascripts/ui/site/HomeView.js
+++ b/public/assets/javascripts/ui/site/HomeView.js
@@ -9,6 +9,9 @@ var HomeView = View.extend({
var player = $f( okplayer )
player.addEvent('ready', function(){
+ player.addEvent('play', function(){
+ player.api('setVolume', 1.0)
+ })
player.addEvent('finish', function(){
hide()
})
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e3bb325..632d816 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -839,7 +839,7 @@ iframe.embed {
.gopro span{
font-size: 24px;
font-weight: 300;
- width: 740px;
+ width: 710px;
display: block;
margin: 0 auto;
line-height: 50px;