summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulie lala <jules@okfoc.us>2015-05-08 04:12:28 -0400
committerjulie lala <jules@okfoc.us>2015-05-08 04:12:28 -0400
commit03a9bad5398309cd97d8989fe8d0b631b6349636 (patch)
tree5a6c06d45900aab09ef761c2a95964d63c3f004e
parent94744f592b43824fdd4c04ec2a5ef9f4e3c2d652 (diff)
about page
-rw-r--r--site/db.json66
-rw-r--r--site/index.js6
-rw-r--r--site/public/assets/style.css20
-rw-r--r--site/templates/about.liquid9
4 files changed, 98 insertions, 3 deletions
diff --git a/site/db.json b/site/db.json
index 299b86b..d031325 100644
--- a/site/db.json
+++ b/site/db.json
@@ -1084,7 +1084,7 @@
{
"id": "about",
"title": "WHO WE ARE",
- "body": "Two Hustlers is a creative collective of radical thinkers, designers and storytellers. \r\n\r\nWe build transmedia experiences for the millennial mindset, with the worlds imaginative collaborators. \r\n<br>\r\nWEBSITE BY <a href=\"http://okfoc.us/\">OKFOCUS</a>",
+ "body": "TWO HUSTLERS IS A CREATIVE COLLECTIVE OF RADICAL THINKERS, DESIGNERS AND STORYTELLERS.\r\nWE BUILD TRANSMEDIA EXPERIENCES FOR THE MILLENIAL MINDSET, WITH THE WORLD'S MOST IMAGINATIVE COLLABORATORS.\r\n<a href=\"mailto:info@twohustlers.com\">SAY HELLO!</a>\r\n\r\nWEBSITE BY <a href=\"http://okfoc.us/\">OKFOCUS</a>",
"image": "http://www.lansdowneresort.com/meetings/assets/images/masthead/meetings-team-building.jpg",
"__index": "1"
},
@@ -1167,7 +1167,69 @@
{
"id": "about-images",
"title": "About Images",
- "__index": 1
+ "__index": "1",
+ "images": [
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F9303920a-07a1-457f-a33d-8959f0acc240.gif",
+ "caption": "propersavage@gmail.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F085bc32f-f3fa-485f-8411-4b0e33c87c34.gif",
+ "caption": "Tracy@Twohustlers.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F3199e264-13d0-4331-9b3a-9f453e723d4e.gif",
+ "caption": "Kei@twohustlers.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fc9b7ab94-a319-48b4-871b-6d1f0a91c55b.gif",
+ "caption": "Sarah@nicopanda.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fe4ee44a3-0b21-4767-8584-397425abb291.gif",
+ "caption": "info@twohustlers.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fbe142c51-d613-41a9-9432-f96ce4493f01.gif",
+ "caption": "Steve@twohustlers.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fc91b507a-9a1d-41d6-a500-138c14b8bed2.gif",
+ "caption": "Max@twohustlers.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fb40d3a6d-1348-4861-a0ab-1280480d1c20.gif",
+ "caption": "tomorrowistheendoftheworld@gmail.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F2306f2f9-e41b-46bb-9458-6d0624b8f6ba.gif",
+ "caption": "Tiffanie@twohustlers.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fff60aa79-d4ad-43d2-915e-d8e253330ca4.gif",
+ "caption": "Latif@nicopanda.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fc8e8276c-3b7c-48e1-8e1f-de902ca1054d.gif",
+ "caption": "Ian@studioformichetti.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F4369b27f-095e-4e05-b7b8-3dc88f0a652f.gif",
+ "caption": "dereklmurdock@gmail.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fa0eed5ee-1c19-41f4-be2e-d0655874be71.gif",
+ "caption": "Tyler@nicopanda.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F959c8f09-9562-4d43-8bfb-4f73b9f71dcc.gif",
+ "caption": "Daneil@studioformichetti.com"
+ },
+ {
+ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fe9743a0f-7c5e-411a-b59e-683e6ff9d407.gif",
+ "caption": "Juan@nicopanda.com"
+ }
+ ]
}
]
} \ No newline at end of file
diff --git a/site/index.js b/site/index.js
index 712c01c..4c5c2ca 100644
--- a/site/index.js
+++ b/site/index.js
@@ -71,7 +71,11 @@ var app = okcms.createApp({
]
},
'/about': {
- data: {type: 'page', query: 'about'}
+ data: [
+ {type: 'page', query: 'about'},
+ {type: 'shape', query: 'about-images'},
+ ],
+ template: 'about'
},
'/contact': {
data: {type: 'page', query: 'contact'}
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index d9da2c7..5cd0b15 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -820,6 +820,26 @@ nav .sub.active a {
top:0;
}
+.brady {
+ display: block;
+ max-width: 1001px;
+}
+.brady a, .brady img {
+ width: 200px; height: 200px;
+ position: relative;
+ display: inline-block;
+}
+.brady a:hover:after {
+ content: 'SAY HELLO!';
+ position: absolute;
+ top: 40%;
+ left: 0;
+ text-decoration: underline;
+ text-align: center;
+ font-size: 22px;
+ width: 100%;
+}
+
.project {
float: left;
width: 25%;
diff --git a/site/templates/about.liquid b/site/templates/about.liquid
new file mode 100644
index 0000000..809685a
--- /dev/null
+++ b/site/templates/about.liquid
@@ -0,0 +1,9 @@
+<div class="entry page">
+ <span>
+ <span class="postname">{{page.title}}</span>
+ <span class="brady">{% for image in shape.images %}<a href="mailto:{{image.caption}}"><img src="{{ image.uri }}"></a>{% endfor %}</span>
+ <div class="content">
+ {{page.body | newline_to_br}}
+ </div>
+ </span>
+</div>