Merge branch 'master' of github.com:okfocus/portfolio

10 files changed, 16 insertions, 3 deletions

diff --git a/public/assets/img/d-white.png b/public/assets/img/d-white.png
new file mode 100644
index 0000000..13edce0
--- /dev/null
+++ b/public/assets/img/d-white.png
diff --git a/public/assets/img/l-white.png b/public/assets/img/l-white.png
new file mode 100644
index 0000000..ead74c7
--- /dev/null
+++ b/public/assets/img/l-white.png
diff --git a/public/assets/img/l.png b/public/assets/img/l.png
index 383e388..bcd4aea 100644
--- a/public/assets/img/l.png
+++ b/public/assets/img/l.png
diff --git a/public/assets/img/r-white.png b/public/assets/img/r-white.png
new file mode 100644
index 0000000..d4f3163
--- /dev/null
+++ b/public/assets/img/r-white.png
diff --git a/public/assets/img/u-white.png b/public/assets/img/u-white.png
new file mode 100644
index 0000000..d850c89
--- /dev/null
+++ b/public/assets/img/u-white.png
diff --git a/public/assets/img/u.png b/public/assets/img/u.png
index 530d460..7c4da62 100644
--- a/public/assets/img/u.png
+++ b/public/assets/img/u.png
diff --git a/public/assets/img/x-w-white.png b/public/assets/img/x-w-white.png
new file mode 100644
index 0000000..3a3522a
--- /dev/null
+++ b/public/assets/img/x-w-white.png
diff --git a/public/assets/img/x-white.png b/public/assets/img/x-white.png
new file mode 100644
index 0000000..66781bf
--- /dev/null
+++ b/public/assets/img/x-white.png
diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js
index bc2a715..2bb0f32 100644
--- a/public/assets/js/lib/ProjectView.js
+++ b/public/assets/js/lib/ProjectView.js
@@ -5,6 +5,7 @@ var ProjectView = View.extend({
     "click .page-up": "previous",
     "click .page-down": "next",
     "click .top": "stopPropagation",
+    "click a": "preventDefault",
   },
   
   initialize: function(opt){
diff --git a/public/assets/ok.css b/public/assets/ok.css
index 876354b..ef2a209 100644
--- a/public/assets/ok.css
+++ b/public/assets/ok.css
@@ -275,8 +275,8 @@ nav svg g g:last-child rect {
     width: 70px;
 }
 
-.navopen .item {
-    cursor: url(img/x-w.png) 32 32, pointer;
+.navopen #curtain {
+    cursor: url(img/x-w-white.png) 32 32, pointer;
 }
 
 
@@ -523,6 +523,9 @@ body {
     margin-left: 20vw;
     cursor: url(img/u.png) 32 0, pointer;
 }
+.whiteCursor .page-up {
+    cursor: url(img/u-white.png) 32 0, pointer;
+}
 
 .page-down {
     height: 70%;
@@ -532,7 +535,10 @@ body {
     bottom: 0;
     left: 0;
     margin-left: 20vw;
-    cursor: url(img/d.png)32 64, pointer;
+    cursor: url(img/d.png) 32 64, pointer;
+}
+.whiteCursor .page-down {
+    cursor: url(img/d-white.png) 32 64, pointer;
 }
 
 .single .page-up,
@@ -583,12 +589,18 @@ button.next {
     cursor: url(img/r.png)64 32, pointer;
     z-index: 4;
 }
+.whiteCursor button.next {
+    cursor: url(img/r-white.png)64 32, pointer;
+}
 
 button.previous {
     left: 0;
     cursor: url(img/l.png) 0 32, pointer;
     z-index: 4;
 }
+.whiteCursor button.previous {
+    cursor: url(img/l-white.png) 0 32, pointer;
+}
 
 .desktop button.previous:hover svg,
 .desktop button.next:hover svg {