diff options
| -rw-r--r-- | db.json | 11 | ||||
| -rw-r--r-- | index.js | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | public/assets/js/app.js | 12 | ||||
| -rw-r--r-- | templates/index.liquid | 6 |
5 files changed, 19 insertions, 14 deletions
@@ -5,14 +5,21 @@ "year": 2016, "title": "Annapurna Pictures", "link": "http://annapurna.pictures/", - "NatureOfWork": "DesignProgramming", + "NatureOfWork": "Design\r\nProgramming", "brief": "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.\r\n", "image": { "uri": "https://ltho.s3.amazonaws.com/ebd3062e-1cf4-4a2d-a7f3-240f66e32258.png", "caption": "" }, "press": [ - "http://asdf.us/" + { + "text": "New York Times", + "uri": "http://nytimes.com/" + }, + { + "text": "WSJ", + "uri": "http://wsj.com/" + } ], "__index": "0", "dateCreated": "Sat, 26 Mar 2016 20:34:21 GMT", @@ -23,7 +23,7 @@ var app = okcms.createApp({ title: {type: 'string'}, client: {type: 'string'}, link: {type: 'string'}, - NatureOfWork: {type: 'tag-list'}, + NatureOfWork: {type: 'text'}, brief: {type: 'text'}, image: {type: 'image'}, containImage: {type: 'flag'}, diff --git a/package.json b/package.json index d09219a..57fcbae 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dotenv": "^2.0.0", "flickity": "^1.2.1", "object-assign": "^2.0.0", - "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.18" + "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.20" }, "homepage": "https://github.com/okfocus/portfolio" } diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 8f0bfe6..f342d05 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -16,15 +16,13 @@ $('.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'); }); - diff --git a/templates/index.liquid b/templates/index.liquid index 292f2de..62eaf40 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -70,7 +70,7 @@ <span>{{ project.title }}</span> <span> <ul> - {% assign categories = project.NatureOfWork | split "\n" %} + {% assign categories = project.NatureOfWork | newline_to_br | split: '<br />' %} {% for category in categories %} <li> {{ category }} @@ -83,9 +83,9 @@ </span> <span> <ul> - {% for link in project.links %} + {% for link in project.press %} <li> - <a href="{{ link.url }}">{{ link.name }}</a> + <a href="{{ link.uri }}">{{ link.text }}</a> </li> {% endfor %} </ul> |