From ae685a3a3e0427b9bf47a73f0f170235e469c979 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 6 Apr 2016 17:45:01 -0400 Subject: flag to hide project, use white cursor --- index.js | 2 ++ public/assets/js/lib/ProjectView.js | 1 + templates/index.liquid | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 1e62275..1914ba5 100644 --- a/index.js +++ b/index.js @@ -41,6 +41,8 @@ var app = okcms.createApp({ media: {type: 'media-list'}, mobileMedia: {type: 'media-list'}, press: {type: 'link-list'}, + whiteCursor: {type: 'flag'}, + hideProject: {type: 'flag'}, }, }, 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/templates/index.liquid b/templates/index.liquid index 6f9d1c7..a932851 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -33,10 +33,12 @@
  • Cover
  • Introduction
    • {% for project in projects %} + {% unless project.hideProject %}
  • {{ project.title }} {% if project.mobileTitle %}{{ project.mobileTitle }}{% else %}{{ project.title }}{% endif %}
    • + {% endunless %} {% endfor %} @@ -117,8 +119,9 @@
    {% for project in projects %} + {% unless project.hideProject %}
    -
    +
    {% for media in project.media %} {% if media.type == 'image' %}
    @@ -183,6 +186,7 @@
    + {% endunless %} {% endfor %} -- cgit v1.2.3-70-g09d2 From f4b648ce919ddef49c6634372f1db57130678a6c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 6 Apr 2016 17:58:05 -0400 Subject: cursor images/css --- public/assets/img/d-white.png | Bin 0 -> 1198 bytes public/assets/img/l-white.png | Bin 0 -> 1232 bytes public/assets/img/l.png | Bin 187 -> 2869 bytes public/assets/img/r-white.png | Bin 0 -> 1219 bytes public/assets/img/u-white.png | Bin 0 -> 1153 bytes public/assets/img/u.png | Bin 288 -> 2971 bytes public/assets/img/x-w-white.png | Bin 0 -> 1203 bytes public/assets/img/x-white.png | Bin 0 -> 1322 bytes public/assets/ok.css | 18 +++++++++++++++--- 9 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 public/assets/img/d-white.png create mode 100644 public/assets/img/l-white.png create mode 100644 public/assets/img/r-white.png create mode 100644 public/assets/img/u-white.png create mode 100644 public/assets/img/x-w-white.png create mode 100644 public/assets/img/x-white.png diff --git a/public/assets/img/d-white.png b/public/assets/img/d-white.png new file mode 100644 index 0000000..13edce0 Binary files /dev/null and b/public/assets/img/d-white.png differ diff --git a/public/assets/img/l-white.png b/public/assets/img/l-white.png new file mode 100644 index 0000000..ead74c7 Binary files /dev/null and b/public/assets/img/l-white.png differ diff --git a/public/assets/img/l.png b/public/assets/img/l.png index 383e388..bcd4aea 100644 Binary files a/public/assets/img/l.png and b/public/assets/img/l.png differ diff --git a/public/assets/img/r-white.png b/public/assets/img/r-white.png new file mode 100644 index 0000000..d4f3163 Binary files /dev/null and b/public/assets/img/r-white.png differ diff --git a/public/assets/img/u-white.png b/public/assets/img/u-white.png new file mode 100644 index 0000000..d850c89 Binary files /dev/null and b/public/assets/img/u-white.png differ diff --git a/public/assets/img/u.png b/public/assets/img/u.png index 530d460..7c4da62 100644 Binary files a/public/assets/img/u.png and b/public/assets/img/u.png differ 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 Binary files /dev/null and b/public/assets/img/x-w-white.png differ diff --git a/public/assets/img/x-white.png b/public/assets/img/x-white.png new file mode 100644 index 0000000..66781bf Binary files /dev/null and b/public/assets/img/x-white.png differ 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 { -- cgit v1.2.3-70-g09d2