audio

2 files changed, 29 insertions, 11 deletions

diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js
index a0e0055..c269d38 100644
--- a/public/assets/js/lib/ProjectView.js
+++ b/public/assets/js/lib/ProjectView.js
@@ -17,6 +17,7 @@ var ProjectView = View.extend({
 
     this.images = this.$images.toArray().map(function(img){ return $(img).data("uri") })
 
+
     if (is_mobile) {
       this.$iframes.remove()
       this.$videos.remove()
@@ -76,6 +77,7 @@ var ProjectView = View.extend({
   },
   
   show: function(){
+    var audio = this.$("audio") 
     app.header.updatePageNumber( this.page_number )
     app.header.updateSlideNumber( 0 )
     app.header.updateSlideCount( this.slide_count )
@@ -86,7 +88,9 @@ var ProjectView = View.extend({
       app.router.pushState("/")
     }
     else {
+      audio.get(0).play();
       app.router.pushState("/project/" + this.project_id)
+
     }
     
     this.$images.each(function(){
@@ -120,6 +124,7 @@ var ProjectView = View.extend({
   },
   
   hide: function(){
+
     addClassForPeriod( this.el, "hiding", app.navigation_delay, function(){
       this.reset()
     }.bind(this) )
@@ -140,12 +145,14 @@ var ProjectView = View.extend({
     if (is_mobile) return;
     e.stopPropagation()
     app.nav.previous()
+    audio.pause();
   },
 
   next: function(e){
     if (is_mobile) return;
     e.stopPropagation()
     app.nav.next()
+    audio.pause();
   },
 
 })
diff --git a/public/assets/ok.css b/public/assets/ok.css
index 14a8cd6..63e53d6 100644
--- a/public/assets/ok.css
+++ b/public/assets/ok.css
@@ -20,7 +20,12 @@ html {
 ::-moz-selection {
     color: blue;
 }
-
+audio {
+    position:fixed;
+    top:-800000px;
+    left:-90000px;
+    opacity:0;
+}
 a,
 a:visited {
     color: blue;
@@ -115,9 +120,9 @@ h3 {
 .intro div.text {
     width: 50%;
     -webkit-column-count: 2;
-    -webkit-column-gap: 5px;
-    -moz-column-gap: 5px;
-    column-gap: 5px;
+    -webkit-column-gap: 10px;
+    -moz-column-gap: 10px;
+    column-gap: 10px;
     font-size: 12px;
 }
 
@@ -713,7 +718,7 @@ nav {
 
 .projectLink {
     display: block;
-
+    margin-top:3px;
 }
 
 ul li {
@@ -749,18 +754,24 @@ ul li {
     .projectLink {
         margin-top: 3px;
     }
+        .intro div.text, h3 {
+        font-size:14px;
+        line-height: 20px;
+    }
+
 }
 
 
-/*
-    @media (min-width: 1400px) {
-        .texts {
-            font-size: 14px;
-            line-height: 16px;
-        }
+
+    @media (min-width: 1500px) {
+    .intro div.text, h3 {
+        font-size:16px;
+        line-height: 24px;
+    }
 
     }
     
+    /*
     @media (min-width: 1600px) {
         .texts {
             font-size: 15px;