From fb5c451361916593edf39ed5f3614984dc29a36d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 27 May 2015 13:22:13 -0400
Subject: box

---
 site/db.json                 | 3 ++-
 site/index.js                | 1 +
 site/public/assets/style.css | 4 ++--
 site/templates/about.liquid  | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'site')

diff --git a/site/db.json b/site/db.json
index 010ad37..16a689a 100644
--- a/site/db.json
+++ b/site/db.json
@@ -1139,7 +1139,8 @@
       "image": "http://www.lansdowneresort.com/meetings/assets/images/masthead/meetings-team-building.jpg",
       "__index": "1",
       "contact": "FOR BRANDS WHO WANT TO PLAY WITH US, <a href=\"mailto:collaborate@twohustlers.com?subject=SAY HELLO!\">SAY HELLO!</a>\r\n\r\nFOR ANYONE WHO WANTS TO JOIN OUR FAMILY, <a href=\"mailto:jobs@twohustlers.com?subject=JOIN THE FAMILY!\"> SHOW US WHAT YOU ARE MADE OF!</a>\r\n\r\nWEBSITE BY <a href=\"http://okfoc.us/\">OKFOCUS</a>",
-      "dateCreated": ""
+      "dateCreated": "",
+      "collabs": "\"NONE OF US IS AS SMART AS ALL OF US\"\r\n\r\nWE MAKE THINGS WITH OUR FRIENDS:\r\n\r\nMERI MEDIA\r\nOKFOCUS\r\nMARK FOSTER GAGE ARCHITECTS\r\nMOVING IMAGE & CONTENT\r\nNR2154\r\nTABLE OF CONTENTS\r\nTAKE OUT MEDIA\r\nSHADES OF GREY"
     },
     {
       "id": "contact",
diff --git a/site/index.js b/site/index.js
index 8952c46..aa1f58c 100644
--- a/site/index.js
+++ b/site/index.js
@@ -25,6 +25,7 @@ var app  = okcms.createApp({
       id: {type: 'string', hidden: true},
       title: {type: 'string'},
       body: {type: 'text'},
+      collabs: {type: 'text'},
       contact: {type: 'text'},
       image: {type: 'string'}
     },
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 3443642..6fbf74f 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -842,11 +842,11 @@ nav .sub.active a {
   float: left;
 }
 .brady div {
-  width: 17vw;
+  width: 17.1vw;
   position: relative;
   display: block;
   float: left;
-  padding: 1vw;
+  padding: 1vw 0.5vw 1vw 0.5vw;
   font-size: 0.8vw;
   line-height: 1.4vw;
   border: 1px solid black;
diff --git a/site/templates/about.liquid b/site/templates/about.liquid
index c693b61..14c046e 100644
--- a/site/templates/about.liquid
+++ b/site/templates/about.liquid
@@ -3,6 +3,7 @@
     <span class="brady">
       <div class="aboutcontent">{{page.body | newline_to_br}}</div>
       {% for image in shape.images %}<a href="mailto:{{image.caption}}?subject=SAY HELLO!" style="background-image:url({{ image.uri }})"><span>{{ image.label }}</span></a>{% endfor %}
+      <div class="collabscontent">{{page.collabs | newline_to_br}}</div>
       <div class="contactcontent">{{page.contact | newline_to_br}}</div>
     </span>
   </span>
-- 
cgit v1.2.3-70-g09d2