From a6e734472853328cca725acbbcad0416763e934e Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Thu, 9 Apr 2015 19:27:40 -0400 Subject: newline_to_br --- site/templates/page.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'site/templates/page.liquid') diff --git a/site/templates/page.liquid b/site/templates/page.liquid index f752cb9..52b64dc 100644 --- a/site/templates/page.liquid +++ b/site/templates/page.liquid @@ -3,7 +3,7 @@ {{page.title}}
- {{page.body}} + {{page.body | newline_to_br}}
-- cgit v1.2.3-70-g09d2 From 0f625b3e6b511f4ee1323da30e6280f4880955fc Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 16 Apr 2015 12:38:31 -0400 Subject: get rid of contact image --- site/db.json | 2 +- site/public/assets/images/2H_LOGOMARK.svg | 12 ++++++------ site/public/assets/style.css | 4 ++++ site/templates/index.liquid | 6 +++--- site/templates/page.liquid | 14 ++++++++++---- 5 files changed, 24 insertions(+), 14 deletions(-) (limited to 'site/templates/page.liquid') diff --git a/site/db.json b/site/db.json index f8431f0..d0624e8 100644 --- a/site/db.json +++ b/site/db.json @@ -42,7 +42,7 @@ "id": "contact", "title": "CONTACT", "body": "TWOHUSTLERS\r\n50 WHITE STREET\r\nNEW YORK, NY 10013\r\nINFO@TWOHUSTLERS.COM\r\n+1 646 370-1180\r\nTWOHUSTLERS ©2014\r\nWEBSITE BY OKFOCUS", - "image": "http://checkingintocollege.com/wp/wp-content/uploads/2014/08/angryphone.jpg", + "image": "", "__index": "0" } ], diff --git a/site/public/assets/images/2H_LOGOMARK.svg b/site/public/assets/images/2H_LOGOMARK.svg index 9af234a..43a9691 100644 --- a/site/public/assets/images/2H_LOGOMARK.svg +++ b/site/public/assets/images/2H_LOGOMARK.svg @@ -7,11 +7,11 @@ - - + - - + - -
+ viewBox="338.1 276.3 660.5 819.7" xml:space="preserve"> - + @@ -176,7 +176,7 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends. c0,1-0.1,1.8-0.3,2.7c-0.1,0.8-0.1,1.7-0.3,2.5c0,0.3,0,0.6-0.1,0.8c-4,29.5-20.9,56.4-58.2,93.1l-81.8,80.1 c-53.5,52.1-85.9,103.9-101.6,162.9c-6.7,25.1-13.7,52.6-14.5,81L712.3,705.6z"/> - + diff --git a/site/templates/page.liquid b/site/templates/page.liquid index 52b64dc..7c295ff 100644 --- a/site/templates/page.liquid +++ b/site/templates/page.liquid @@ -1,9 +1,15 @@
{{page.title}} - -
- {{page.body | newline_to_br}} -
+ {% if page.image %} + +
+ {{page.body | newline_to_br}} +
+ {% else %} +
+ {{page.body | newline_to_br}} +
+ {% endif %}
-- cgit v1.2.3-70-g09d2 From 40d553c5e76aa685f547faa2419fd4e71cbf67a9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 24 Apr 2015 17:44:18 -0400 Subject: maxbytes setting --- app/node_modules/okservices/index.js | 1 + site/index.js | 1 + site/templates/page.liquid | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'site/templates/page.liquid') diff --git a/app/node_modules/okservices/index.js b/app/node_modules/okservices/index.js index 015fff0..fbbdbfd 100644 --- a/app/node_modules/okservices/index.js +++ b/app/node_modules/okservices/index.js @@ -22,6 +22,7 @@ function OKImageService(options) { secret: options.s3.secret, bucket: options.s3.bucket, dirname: options.s3.dirname, + maxBytes: options.s3.maxbytes, headers: { 'x-amz-acl': 'public-read' } diff --git a/site/index.js b/site/index.js index d7989b9..8bb4b4d 100644 --- a/site/index.js +++ b/site/index.js @@ -54,6 +54,7 @@ var app = okcms.createApp({ secret: process.env.S3_SECRET, bucket: process.env.S3_BUCKET, dirname: "twohustlers", + maxbytes: 1024*1024*2, } }, diff --git a/site/templates/page.liquid b/site/templates/page.liquid index 7c295ff..63f71f2 100644 --- a/site/templates/page.liquid +++ b/site/templates/page.liquid @@ -1,7 +1,7 @@
- {{page.title}} {% if page.image %} + {{page.title}}
{{page.body | newline_to_br}} -- cgit v1.2.3-70-g09d2 From 28490413b2a108f11ffef4f6d9f560c516546cec Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 27 Apr 2015 13:33:10 -0400 Subject: adding stuff --- site/public/assets/style.css | 34 +++++++++++++++++++++++++++++----- site/templates/page.liquid | 4 ++++ 2 files changed, 33 insertions(+), 5 deletions(-) (limited to 'site/templates/page.liquid') diff --git a/site/public/assets/style.css b/site/public/assets/style.css index f018d8d..090c8f1 100644 --- a/site/public/assets/style.css +++ b/site/public/assets/style.css @@ -405,7 +405,7 @@ nav .sub.active a { height:auto; position:relative; width:100%; - max-height:40px; + max-height:50px; padding: 3px 0 5px 20px; opacity:1; -webkit-transform:translateY(0)scale(1)skew(0deg); @@ -442,13 +442,37 @@ nav .sub.active a { } .postname { - border-bottom: 1px solid #999; - padding: 20px 0px 0.6em 2px; - margin-bottom: 1em; - font-size: 1em; + border-bottom: 1px solid #999; + padding: 20px 0px 0.6em 2px; + margin-bottom: 0.7em; + font-size: 1em; } +.galnav { + display: inline-block; + width: 100%; + float: left; + clear: both; +} + +.galnav span{ + width: 50%; + background: #999; + color: white; + padding: 2px; + font-size: 11px; + transition:0.2s background; +} +.galnav .nextbutton{ + text-align: right; + background: #888; + cursor:pointer; +} +.galnav span:hover { + background:black; +} + .credit { margin: 4em 0px 0px 0px; padding: 11px 0px; diff --git a/site/templates/page.liquid b/site/templates/page.liquid index 63f71f2..5c3cabe 100644 --- a/site/templates/page.liquid +++ b/site/templates/page.liquid @@ -2,6 +2,10 @@ {% if page.image %} {{page.title}} +
+ PREVIOUS ASSET + NEXT ASSET +
{{page.body | newline_to_br}} -- cgit v1.2.3-70-g09d2 From e75bc9e99c672d774e1e935b37c73970d7b6d2c8 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 1 May 2015 19:10:17 -0400 Subject: edits --- site/index.js | 1 + site/public/assets/images/next.png | Bin 563 -> 1063 bytes site/public/assets/images/prev.png | Bin 0 -> 1069 bytes site/public/assets/javascripts/_env.js | 33 +++++++++++++++++++--- site/public/assets/style.css | 35 ++++++++++++++++++++---- site/templates/page.liquid | 4 --- site/templates/project.liquid | 6 ++-- themes/okadmin/templates/partials/inputs.liquid | 1 + 8 files changed, 63 insertions(+), 17 deletions(-) create mode 100644 site/public/assets/images/prev.png (limited to 'site/templates/page.liquid') diff --git a/site/index.js b/site/index.js index 3434742..50bd870 100644 --- a/site/index.js +++ b/site/index.js @@ -41,6 +41,7 @@ var app = okcms.createApp({ { type: 'page', static: {id: 'about'}}, { type: 'page', static: {id: 'contact'}}, { type: 'shape', static: {id: 'shape-images'}}, + { type: 'shape', static: {id: 'about-images'}}, { type: 'advertising' }, { type: 'content' }, { type: 'experiential' }, diff --git a/site/public/assets/images/next.png b/site/public/assets/images/next.png index 7997259..b5782ed 100644 Binary files a/site/public/assets/images/next.png and b/site/public/assets/images/next.png differ diff --git a/site/public/assets/images/prev.png b/site/public/assets/images/prev.png new file mode 100644 index 0000000..82050a4 Binary files /dev/null and b/site/public/assets/images/prev.png differ diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js index 45d5231..3a72e13 100644 --- a/site/public/assets/javascripts/_env.js +++ b/site/public/assets/javascripts/_env.js @@ -286,6 +286,21 @@ function build_scene () { offset: 200, }) ) + var wasPrev = false, navWidth + function resize_for_prev_next(){ + navWidth = $("nav").width() + } + resize_for_prev_next() + $(window).resize(resize_for_prev_next) + $(window).mousemove(function(e){ + if (! gallery) return + prev = ((e.pageX - navWidth) / window.innerWidth) < 0.39 + if (prev !== wasPrev) { + wasPrev = prev + $("#okgallery").toggleClass("prev", prev) + } + }) + strips.forEach(function(strip){ strip.update(0) }) scene.update() @@ -416,9 +431,15 @@ function build_gallery () { }) $("#okgallery .video").each(function(){ - var $play = $('
') var $el = $(this) + if (! is_mobile) { + var $underlay = $('
') + $underlay.css("background-image", $el.css("background-image")) + $el.css("background-image", 'none') + } + var $play = $('
') $el.append($play) + $el.append($underlay) if (is_desktop) { $play.on("click", function(e){ e.stopPropagation() @@ -454,7 +475,11 @@ function build_gallery () { // load_video($el) } else { - gallery.next() + if ($("#okgallery").hasClass("prev")) { + gallery.previous() + } else { + gallery.next() + } } }) gallery.loader.on("progress", function(imagesLoaded, loadingImage){ @@ -484,8 +509,8 @@ function load_video ($el) { var $embed = $('') $el.append($embed) if (! is_mobile) { - var $mask = $('
') - $el.append($mask) +// var $mask = $('
') +// $el.append($mask) } var player = $f( $el.find("iframe")[0] ) $el.data('player', player) diff --git a/site/public/assets/style.css b/site/public/assets/style.css index 543a34a..6316159 100644 --- a/site/public/assets/style.css +++ b/site/public/assets/style.css @@ -337,7 +337,7 @@ nav .sub { nav .sub.active { display: inline-block; - max-height:180px; + max-height: 450px; } nav .sub a { @@ -519,12 +519,14 @@ nav .sub.active a { -webkit-column-count: 3; -moz-column-count: 3; column-count: 3; + min-height: 130px; } .entry span div.content.noline { border-top: 0; padding-top: 0; } .entry span div.content div { + min-height: 130px; width:50%; -webkit-column-count: 3; -moz-column-count: 3; @@ -573,6 +575,10 @@ nav .sub.active a { height:100%; cursor: url(images/next.png), auto!important; } +.gallery.prev, +.gallery.prev .cell { + cursor: url(images/prev.png), auto!important; +} .cell.video { width: 80%; background-size: cover; @@ -613,12 +619,24 @@ nav .sub.active a { -webkit-transition:0.4s opacity ease-in; transition:0.4s opacity ease-in; pointer-events: none; -} -.cell iframe { height: 200%; -webkit-transform: translateY(-25%); transform: translateY(-25%); } +.cell .underlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height:100%; + opacity:0.2; + -webkit-transition:0.4s opacity ease-in; + transition:0.4s opacity ease-in; + pointer-events: none; + background-size: cover; + background-position: center center; +} + .fullscreen { text-align: right; } @@ -679,22 +697,27 @@ nav .sub.active a { opacity:0.0; transition:0.4s opacity ease-in; } + .cell img.loaded { opacity: 0.2; } -.cell.is-selected img, .cell.is-selected iframe { +.cell.is-selected .underlay, .cell.is-selected img, .cell.is-selected iframe { opacity:1; pointer-events: auto; } -.cell .mask { +.cell .underlay { z-index: 2; width: 100%; height: 100%; position: absolute; top: 0; left: 0; } -.cell.playing .mask { +.cell.loaded .underlay { + background-image: none !important; +} +.cell.playing .underlay { pointer-events: none; + opacity: 0; } .logo { position: fixed; diff --git a/site/templates/page.liquid b/site/templates/page.liquid index 5c3cabe..63f71f2 100644 --- a/site/templates/page.liquid +++ b/site/templates/page.liquid @@ -2,10 +2,6 @@ {% if page.image %} {{page.title}} -
- PREVIOUS ASSET - NEXT ASSET -
{{page.body | newline_to_br}} diff --git a/site/templates/project.liquid b/site/templates/project.liquid index 0dc828c..8c9a26e 100644 --- a/site/templates/project.liquid +++ b/site/templates/project.liquid @@ -2,13 +2,13 @@ {{project.title}}
- PREVIOUS ASSET - NEXT ASSET + PREVIOUS + NEXT
+ {% elsif type == 'meta' %} {% else %} -- cgit v1.2.3-70-g09d2