diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-05-05 12:58:49 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-05-05 12:58:49 -0400 |
| commit | a30c640145ef6dd5240a9a0050222eea058636d9 (patch) | |
| tree | 1ceb1bdac027c4c0d3727b92f74491b86423fd03 | |
| parent | e6070368b3fd0f2d38c9f4b0ac6f3c4fdc57beae (diff) | |
| parent | 761cd914bab5f262ddededa57cb449a233e27fc3 (diff) | |
Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers
| -rw-r--r-- | site/db.json | 11 | ||||
| -rw-r--r-- | site/public/assets/style.css | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/site/db.json b/site/db.json index af870a9..e06bad8 100644 --- a/site/db.json +++ b/site/db.json @@ -875,7 +875,7 @@ "id": "diesel-spring-summer-2014", "title": "Diesel Spring/Summer 2014", "menu": "Diesel S/S 2014", - "description": "FOR DIESEL’S SPRING/SUMMER 2014 CAMPAIGN, OUR PROGRAM CONSISTED OF GROUP PHOTOS, SHOWCASING DIVERSE CULTURES THAT EMBODY THE REBELLIOUS, CREATIVE FREEDOM THAT IS SUCH A STRONG PART OF DIESEL’S DNA.", + "description": "#DIESELREBOOT, SHOT BY INEZ & VINOODH, HIT THE REFRESH BUTTON ON THE BRAND, REIGNITING DIESEL’S RELEVANCE FOR TODAYS CONSUMER & CULTURAL LANDSCAPE. ", "media": [ { "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F5911dfde-f042-4eb6-b9fe-7f0b3d9f45b5.jpg", @@ -950,7 +950,7 @@ "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F1c952512-c765-4a67-a21e-7146c1051ed9.jpg", "caption": "" }, - "__index": 4 + "__index": "4" }, { "id": "diesel-fall-winter-2013", @@ -1164,7 +1164,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 award winning campaigns. \r\n", + "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. ", "image": "http://www.lansdowneresort.com/meetings/assets/images/masthead/meetings-team-building.jpg", "__index": "1" }, @@ -1243,6 +1243,11 @@ } ], "__index": "0" + }, + { + "id": "about-images", + "title": "About Images", + "__index": 1 } ] }
\ No newline at end of file diff --git a/site/public/assets/style.css b/site/public/assets/style.css index 3d55a92..f0f98d8 100644 --- a/site/public/assets/style.css +++ b/site/public/assets/style.css @@ -296,9 +296,12 @@ nav a { color:black; } .contact { - line-height: 22px; + line-height: 14px; padding-left: 10px; padding-right: 10px; + font-size: 10px; + margin-top: 10px; + vertical-align: bottom; } .contact a { display: inline; @@ -315,7 +318,9 @@ nav a { nav .cat.no-hover { opacity: 0.3; } - +.nav .cat.about { + background: #E5E5E7; +} .desktop nav a.active:hover { cursor:default; } |