From 1ac9385f0e106a67c9cac159a88f1ef53ecc8f79 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 26 Mar 2016 17:25:41 -0400 Subject: preliminary formatting.. need to add a couple new datatypes --- index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'index.js') diff --git a/index.js b/index.js index 5f2586a..28b70b8 100644 --- a/index.js +++ b/index.js @@ -21,8 +21,9 @@ var app = okcms.createApp({ id: {type: 'string', hidden: true}, year: {type: 'number'}, title: {type: 'string'}, + client: {type: 'string'}, link: {type: 'string'}, - NatureOfWork: {type: 'text'}, + NatureOfWork: {type: 'tag-list'}, brief: {type: 'text'}, image: {type: 'image'}, press: {type: 'link-list'}, -- cgit v1.2.3-70-g09d2 From cb0b2d229855d80f041b0c44984418ae3097b5b4 Mon Sep 17 00:00:00 2001 From: “Ryder <“r@okfoc.us”> Date: Mon, 28 Mar 2016 13:20:28 -0400 Subject: adding iframe and video --- db.json | 15 +++++++++++++++ index.js | 2 ++ 2 files changed, 17 insertions(+) (limited to 'index.js') diff --git a/db.json b/db.json index b23375b..c615f2c 100644 --- a/db.json +++ b/db.json @@ -17,6 +17,21 @@ "__index": "0", "dateCreated": "Sat, 26 Mar 2016 20:34:21 GMT", "client": "Annapurna Pictures" + }, + { + "id": "test-2", + "year": 2016, + "title": "Test 2", + "client": "Moopy", + "link": "http://moonpies.org", + "NatureOfWork": "poo, surf, eat popcorn", + "brief": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Sed posuere consectetur est at lobortis. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.", + "image": { + "uri": "https://ltho.s3.amazonaws.com/e12aee73-07a1-41f4-a54f-8b8c09f167f9.png", + "caption": "" + }, + "__index": 1, + "dateCreated": "Mon, 28 Mar 2016 17:19:36 GMT" } ] } \ No newline at end of file diff --git a/index.js b/index.js index 28b70b8..eb51e75 100644 --- a/index.js +++ b/index.js @@ -26,6 +26,8 @@ var app = okcms.createApp({ NatureOfWork: {type: 'tag-list'}, brief: {type: 'text'}, image: {type: 'image'}, + iframe: {type: 'string'}, + video: {type: 'string'}, press: {type: 'link-list'}, }, }, -- cgit v1.2.3-70-g09d2 From 12cf2423907cdac9a97ba6925377c73e0b94301d Mon Sep 17 00:00:00 2001 From: “Ryder <“r@okfoc.us”> Date: Mon, 28 Mar 2016 14:16:48 -0400 Subject: iframe demo --- db.json | 7 +++++-- index.js | 1 + public/assets/ok.css | 44 +++++++++++++++----------------------------- templates/index.liquid | 6 ++++-- 4 files changed, 25 insertions(+), 33 deletions(-) (limited to 'index.js') diff --git a/db.json b/db.json index ac34d0e..cb0f96a 100644 --- a/db.json +++ b/db.json @@ -5,7 +5,7 @@ "year": 2016, "title": "Annapurna Pictures", "link": "http://annapurna.pictures/", - "NatureOfWork": "Design\r\nProgramming", + "NatureOfWork": "DesignProgramming", "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", @@ -16,7 +16,10 @@ ], "__index": "0", "dateCreated": "Sat, 26 Mar 2016 20:34:21 GMT", - "client": "Annapurna Pictures" + "client": "Annapurna Pictures", + "containImage": "true", + "iframe": "", + "video": "" }, { "id": "test-2", diff --git a/index.js b/index.js index eb51e75..8de3947 100644 --- a/index.js +++ b/index.js @@ -26,6 +26,7 @@ var app = okcms.createApp({ NatureOfWork: {type: 'tag-list'}, brief: {type: 'text'}, image: {type: 'image'}, + containImage: {type: 'flag'}, iframe: {type: 'string'}, video: {type: 'string'}, press: {type: 'link-list'}, diff --git a/public/assets/ok.css b/public/assets/ok.css index 11f6a58..dd3397e 100644 --- a/public/assets/ok.css +++ b/public/assets/ok.css @@ -8,6 +8,8 @@ box-sizing: inherit; padding: 0; margin: 0; + outline:0; + border:0; } a, @@ -18,6 +20,7 @@ body { font-family: 'Roboto', sans-serif; font-size: 11px; + background:#fff; } div, @@ -33,12 +36,7 @@ -webkit-flex-flow: column wrap; flex-flow: column wrap; } - - .top, - .bottom { - -webkit-flex: 1 auto; - flex: 1 auto; - } + .top { background: yellow; @@ -46,6 +44,7 @@ /*height: 80vh;*/ flex: 1 auto; } + /*! Flickity */ .flickity-enabled { @@ -59,41 +58,28 @@ .flickity-viewport { overflow: hidden; position: relative; - height: 100%; + width:100%; } - + .flickity-slider { position: absolute; width: 100%; - height: 100%; - } - - ::-webkit-full-screen #okgallery { - width: 100%; - height: 100%; - } - - ::-webkit-full-screen #okgallery { - width: 100%; - height: 100%; - } - - .full-screen #okgallery { - width: 100%; - height: 100%; } .cell { width: 100vw; - display: inline-block; - flex: 1 auto; - height: 50vh; + height: 70vh; /*THIS SHOULD BE DYNAMIC*/ + background-position: center; + background-size: cover; + background-repeat: no-repeat; + } + .cell.contain { + background-size: 20% ; + background-color: #eee; } - .bottom { /*height: 20vh;*/ flex: 0 auto; - background: #eee; overflow: hidden; padding: 5px 0; } diff --git a/templates/index.liquid b/templates/index.liquid index f045321..b2f9db1 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -32,8 +32,10 @@ {% for project in projects %}
-
-
+
+
-- cgit v1.2.3-70-g09d2