diff options
| -rw-r--r-- | db.json | 7 | ||||
| -rw-r--r-- | index.js | 1 | ||||
| -rw-r--r-- | public/assets/ok.css | 44 | ||||
| -rw-r--r-- | templates/index.liquid | 6 |
4 files changed, 25 insertions, 33 deletions
@@ -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", @@ -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 %} <div class="item"> <div class="top"> - <div class="cell" style="background-image:url({{ project.image.uri }})"></div> - <div class="cell"></div> + <div class="cell {% if project.containImage == 'true' %}contain{% endif %}" style="background-image:url({{ project.image.uri }})"></div> + <iframe class="cell" src="http://okfoc.us"> + + </iframe> <div class="cell"></div> </div> <div class="bottom {% if project.press %}press{% else %}nopress{% endif %}"> |