merge

5 files changed, 27 insertions, 6 deletions

diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index a58854c..d4c2b03 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -50,12 +50,12 @@ $('.top').flickity({
   pageDots: false,
   wrapAround: true,
   arrowShape: { 
-  x0: 10,
-  x1: 35, y1: 25,
-  x2: 40, y2: 25,
-  x3: 15
+    x0: 10,
+    x1: 35, y1: 25,
+    x2: 40, y2: 25,
+    x3: 15
   }
-});
+})
 
 $('.index').click( function(){
   $('body').toggleClass('navopen');
@@ -82,4 +82,4 @@ $(window).resize(function() {
         $('.top').flickity('resize');
         $('body').removeClass('resizing');
     }, 400);
-});
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/public/assets/js/lib/GalleryView.js b/public/assets/js/lib/GalleryView.js
index da0f580..1d8cdc2 100644
--- a/public/assets/js/lib/GalleryView.js
+++ b/public/assets/js/lib/GalleryView.js
@@ -86,6 +86,7 @@ var GalleryView = View.extend({
     gallery.on("cellSelect", function(){
       if (! gallery.selectedElement) return
       // $caption.html( $(gallery.selectedElement).data("caption") )
+      console.log(gallery.selectedElement)
       try {
         this.videos.forEach(function(player){
           player.api('pause')
diff --git a/public/assets/js/lib/MenuView.js b/public/assets/js/lib/MenuView.js
new file mode 100644
index 0000000..9576757
--- /dev/null
+++ b/public/assets/js/lib/MenuView.js
@@ -0,0 +1,16 @@
+var MenuView = View.extend({
+
+  el: ".menu",
+  
+  events: {
+    "click li": "click",
+  },
+  
+  initialize: function(){
+  },
+  
+  click: function(e){
+    var id = $(e.target).data("id")
+    // navigate to page
+  },
+})
\ No newline at end of file
diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js
index d5ac1c3..ef03094 100644
--- a/public/assets/js/lib/ProjectView.js
+++ b/public/assets/js/lib/ProjectView.js
@@ -4,6 +4,7 @@ var ProjectView = View.extend({
   },
   
   initialize: function(opt){
+    this.gallery = new GalleryView ()
   },
 
 })
diff --git a/public/assets/ok.css b/public/assets/ok.css
index f633fdf..1a9d973 100644
--- a/public/assets/ok.css
+++ b/public/assets/ok.css
@@ -170,6 +170,9 @@ nav span div:last-child {
     margin-top: 20px;
 }
 
+nav b {
+    font-weight: normal;
+}
 
 /* Flickity */