From dc2ec5f9e39547a749595f42c8a7eceecde87a5f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 14 Apr 2015 11:18:45 -0400
Subject: svg

---
 site/public/assets/images/2H_LOGOMARK.svg | 58 +++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 site/public/assets/images/2H_LOGOMARK.svg

(limited to 'site/public/assets/images')

diff --git a/site/public/assets/images/2H_LOGOMARK.svg b/site/public/assets/images/2H_LOGOMARK.svg
new file mode 100644
index 0000000..9af234a
--- /dev/null
+++ b/site/public/assets/images/2H_LOGOMARK.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="338.1 278.3 660.5 819.7" enable-background="new 338.1 278.3 660.5 819.7" xml:space="preserve">
+<g id="Layer_1_1_">
+</g>
+<g id="Isolation_Mode">
+	<g>
+		<polygon points="720.7,802.9 659.5,827.3 790.3,937.6 930.1,881.7 998.6,939.5 998.6,866.8 926.7,806.2 789.5,860.9 		"/>
+		<polygon points="721.2,711.6 340.2,863.7 405.8,919 549.2,861.8 695.4,985.1 552.2,1042.3 618.2,1098 994.4,947.6 928.4,891.9 
+			788.8,947.8 642.5,824.5 789.5,765.7 789.5,690.6 721.2,633 		"/>
+		<polygon points="616.5,930.1 548.3,957.4 548.3,1034.3 678.5,982.3 		"/>
+		<path d="M690.5,318.7c0.4,0.7,0.8,1.4,1.1,2.2l0.1,0.4c0.4,0.8,0.8,1.7,1.3,2.5c1.3,2.8,2.5,5.7,3.6,8.9c0.3,0.7,0.6,1.5,0.8,2.5
+			l0.1,0.3c0,0.3,0.1,0.4,0.3,0.7c0.3,0.6,0.4,1.3,0.6,1.8c0.1,0.6,0.4,1.3,0.6,2c0.7,2.2,1.1,4,1.5,5.7c0.3,1,0.4,2,0.7,2.9
+			c0.1,0.6,0.3,1,0.3,1.5c0.3,1.1,0.4,2.2,0.6,3.4c0.1,1.1,0.4,2.4,0.6,3.5v0.1c0.4,2.7,0.7,5.4,0.8,8.1c0.1,1.3,0.1,2.4,0.3,3.6
+			c0.1,2.9,0.3,5.6,0.3,8.1v1.8c0,0.3,0,0.6,0,0.8v0.4c0,0.3,0,0.6,0,0.8c0,0.8,0,1.8-0.1,2.7c0,1,0,2-0.1,2.9
+			c-0.1,3.1-0.4,6.3-0.7,9.6c-0.1,1.5-0.4,3.2-0.6,4.7c-0.1,1-0.3,2-0.4,3.1c-0.3,1.7-0.6,3.6-1,5.7c-1.3,7.1-3.1,14.5-5.2,21.9
+			c-0.3,0.7-0.4,1.4-0.7,2.1l-0.1,0.6c-0.1,0.6-0.4,1.1-0.6,1.8c-0.3,0.7-0.6,1.5-0.8,2.4c-0.7,2.2-1.5,4.3-2.2,6.4l-0.8,2.4
+			c-0.4,1.3-0.8,2.4-1.4,3.5c-0.4,1-0.8,2-1.3,2.9c-5.9,14.1-13.4,28.5-22.3,42.7l-0.1,0.3c-0.6,0.8-1.1,1.7-1.5,2.5l-0.1,0.1
+			c-1,1.4-1.8,2.8-2.8,4.2c-1.1,1.5-2.1,3.2-3.2,4.7c-3.8,5.3-7.7,10.6-11.4,15.6c-1.4,1.7-2.7,3.5-4,5.2
+			c-4.2,5.3-8.4,10.1-12.4,14.8l-0.8,1c-0.6,0.7-1.3,1.4-1.8,2.1c-5.4,6-11,11.9-16.6,17.5c-1,1-2,2-2.8,2.8l-0.1,0.1L512.9,661
+			c-1.4,1.4-30.3,32.5-39.8,57.8l156.8-62.5c4.9-4.7,10.2-10.1,12.4-12.1c30.4-29.7,61.7-60.6,84.9-97.4
+			c22.9-36.9,35.3-71.8,36.6-103.7c1.7-22.3-0.1-63.8-30.4-91.2c-6.6-5.9-13.7-11.7-20-16.9c-3.4-2.7-6.7-5.4-9.9-8.2l-7.3-6.1
+			l-8.1-6.7c0.1,0.1,0.1,0.3,0.3,0.4C688.7,315.3,689.5,316.9,690.5,318.7z"/>
+		<path d="M403.3,590.8l100.2-40.1c0-0.1,0-0.4,0-0.6l0,0V550c0-0.4,0-0.8,0-1.4c0-0.8,0-1.5,0.1-2.4c0-0.6,0-1.1,0.1-1.7
+			c0-0.7,0.1-1.3,0.1-2s0.1-1.3,0.1-2c0-0.6,0.1-1.1,0.1-1.5c0-0.7,0.1-1.4,0.3-2.1c0-0.4,0.1-0.8,0.1-1.3c0.1-0.7,0.1-1.5,0.3-2.2
+			c0-0.3,0.1-0.7,0.1-1c0.1-0.8,0.3-1.5,0.4-2.4c0-0.3,0.1-0.4,0.1-0.7c0.1-0.8,0.3-1.8,0.4-2.7l0,0c11.4-58.9,60.7-81.7,78.9-88.1
+			c0.1-0.7,0.3-1.4,0.3-2.1l0.1-0.6c0.1-0.7,0.3-1.5,0.3-2.4c0.1-0.8,0.1-1.5,0.1-2.4v-0.3c0-0.1,0-0.3,0-0.4c0-0.1,0-0.3,0-0.4v-1
+			c0-1,0.1-1.8,0.1-2.8v-0.1c0-1,0-2,0-2.9v-1c0-13.7-4.5-24.9-12.3-31.6c-0.8-0.7-1.8-1.4-2.7-2c-5.6-3.6-12.6-5.6-20.8-5.6
+			c-5.2,0-10.8,0.7-16.6,2.2c-0.6,0.1-1,0.3-1.5,0.4l-0.3,0.1c-4.5,1.1-9.2,2.7-13.8,4.6c-6.4,2.5-12.6,5.6-18.3,9.1
+			c-2.1,1.3-3.9,2.4-5.6,3.5c-1.5,1-2.9,2.1-4.5,3.2c0,0-0.1,0-0.1,0.1c-3.8,2.9-6.7,5.3-8.2,6.7c-1.4,1.3-4.9,4.6-5.3,5l-0.1,0.1
+			c-1.1,1.1-2,2.1-2.9,3.1c-1.4,1.5-2.8,3.2-4.2,4.9c-0.8,1.1-1.7,2.2-2.7,3.4c-0.3,0.4-2.5,3.5-3.6,5.2c-0.8,1.1-1.5,2.4-2.2,3.5
+			c-0.7,1.1-1.4,2.4-2.1,3.6c-0.7,1.1-1.3,2.2-2,3.6c-1,1.8-1.8,3.8-2.7,5.6c-6.4,14.4-9.6,29.9-9.6,46.1c0,0.8,0,1.7,0,2.4l0.3,3.2
+			l-98.6,39.4L403.3,590.8z"/>
+		<path d="M712.3,705.6v-72.9L459.9,733.2l1.5-8c5.7-29.3,43-69,44.5-70.6l0.1-0.1l95.1-94c1-1,2-1.8,2.8-2.8
+			c5.6-5.6,11-11.3,16.3-17.2c0.6-0.7,1.1-1.3,1.7-2l0.8-1c4-4.6,8.1-9.4,12.1-14.4c1.4-1.7,2.7-3.4,4-5c3.8-4.9,7.5-10.1,11.2-15.2
+			c1.1-1.5,2.1-3.1,3.2-4.7c1-1.4,1.8-2.8,2.8-4.2v-0.1c0.6-0.8,1-1.5,1.5-2.4l0.1-0.3c8.8-13.8,16.1-27.8,21.8-41.5
+			c0.4-1,0.8-2,1.1-2.8c0.4-1.1,0.8-2.2,1.3-3.2l0.8-2.4c0.7-2,1.4-4,2.1-6.1v-0.1c0.3-0.7,0.6-1.4,0.7-2.1v-0.1
+			c0.1-0.6,0.4-1.1,0.6-1.7l0.1-0.6c0.1-0.7,0.4-1.4,0.7-2.1c2.1-7,3.8-14,5-20.8c0.4-2.1,0.7-3.9,1-5.4c0.1-1,0.3-2,0.4-2.8
+			c0.1-1.5,0.4-3.1,0.6-4.6c0.3-3.2,0.6-6.3,0.7-9.2v-0.1c0-0.8,0.1-1.7,0.1-2.7v-0.1c0-0.8,0-1.8,0.1-2.7v-0.3v-0.1v-1v-0.1v-1.8
+			c0-2.4,0-4.9-0.1-7.7c0-1.1-0.1-2.2-0.3-3.4c-0.1-2.5-0.4-5-0.8-7.5v-0.1c-0.1-1.1-0.3-2.2-0.6-3.4c-0.1-1.1-0.4-2.1-0.6-3.1
+			c-0.1-0.4-0.1-1-0.3-1.4c-0.1-1-0.4-1.8-0.6-2.8c-0.4-1.5-0.8-3.2-1.4-5.3c-0.1-0.6-0.3-1.1-0.4-1.7v-0.1c-0.1-0.6-0.3-1-0.4-1.5
+			c-0.1-0.3-0.3-0.7-0.3-1l-0.1-0.3c-0.3-0.7-0.4-1.4-0.7-2.1c-1.1-2.9-2.2-5.7-3.4-8.2v-0.1c-0.3-0.7-0.6-1.3-1-2
+			c-0.1-0.3-0.3-0.4-0.3-0.7c-0.3-0.7-0.7-1.3-1-2c-0.8-1.5-1.7-2.9-2.5-4.3V318c-0.3-0.4-0.6-0.8-1-1.4l-0.1-0.1
+			c-0.3-0.6-0.7-1-1-1.5c-0.6-0.8-1-1.5-1.4-2.1l-0.1-0.1c-0.4-0.6-1-1.3-1.5-2c-0.8-1-1.5-1.8-2.2-2.7c-0.7-0.7-1.3-1.5-2-2.2
+			c-0.4-0.6-1-1.1-1.5-1.5l-0.1-0.1c-0.3-0.3-0.6-0.6-0.8-0.8l-0.1-0.1c-1.5-1.4-2.7-2.7-3.9-3.6c-4.6-3.9-9.6-7.4-15.1-10.2
+			c-14-7.3-30.6-11-49.1-11c-23.6,0-50.3,5.9-79.2,17.5c-122.7,49-178.3,153.6-178.1,229.9c0,2.2,0.1,4.7,0.3,7.5l92.3-36.9
+			c0-17.3,3.5-34.1,10.3-49.4c0.8-2.1,2-4,2.9-6.1c0.8-1.5,1.5-2.8,2.2-4c0.7-1.3,1.5-2.7,2.2-3.9c0.8-1.3,1.5-2.5,2.5-3.8
+			c1.3-1.8,3.8-5.3,3.9-5.4l0.1-0.1c1-1.1,1.8-2.4,2.8-3.5c1.4-1.8,2.9-3.5,4.5-5.2c1-1.1,2-2.1,3.1-3.4c0.8-0.8,4.5-4.3,5.9-5.6
+			c2.2-2,6.4-5.3,8.7-7.1l0,0l0.3-0.1c1.5-1.1,3.2-2.4,4.7-3.4c1.7-1.3,3.8-2.4,6-3.8c6.1-3.6,12.7-6.8,19.5-9.6
+			c5-2,9.9-3.6,14.8-4.9h0.3c0.6-0.1,1.1-0.3,1.8-0.4c6.6-1.5,13-2.4,18.7-2.4c9.9,0,18.6,2.4,25.5,7c1.1,0.8,2.4,1.7,3.5,2.7
+			c9.9,8.4,15.5,21.9,15.5,38.3v1c0,1.1,0,2.1,0,3.2c0,1,0,2.1-0.1,3.1l-0.1,1.3c0,0.1,0,0.3,0,0.4c0,0.1,0,0.3,0,0.6
+			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"/>
+	</g>
+</g>
+</svg>
-- 
cgit v1.2.3-70-g09d2


From 0f625b3e6b511f4ee1323da30e6280f4880955fc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
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/public/assets/images')

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\n<a href=\"mailto:info@twohustlers.com\">INFO@TWOHUSTLERS.COM</a>\r\n+1 646 370-1180\r\nTWOHUSTLERS ©2014\r\nWEBSITE BY <a href=\"http://okfoc.us/\">OKFOCUS</a>",
-      "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 @@
 </g>
 <g id="Isolation_Mode">
 	<g>
-		<polygon points="720.7,802.9 659.5,827.3 790.3,937.6 930.1,881.7 998.6,939.5 998.6,866.8 926.7,806.2 789.5,860.9 		"/>
-		<polygon points="721.2,711.6 340.2,863.7 405.8,919 549.2,861.8 695.4,985.1 552.2,1042.3 618.2,1098 994.4,947.6 928.4,891.9 
+		<polygon fill="#ffffff" points="720.7,802.9 659.5,827.3 790.3,937.6 930.1,881.7 998.6,939.5 998.6,866.8 926.7,806.2 789.5,860.9 		"/>
+		<polygon fill="#ffffff" points="721.2,711.6 340.2,863.7 405.8,919 549.2,861.8 695.4,985.1 552.2,1042.3 618.2,1098 994.4,947.6 928.4,891.9 
 			788.8,947.8 642.5,824.5 789.5,765.7 789.5,690.6 721.2,633 		"/>
-		<polygon points="616.5,930.1 548.3,957.4 548.3,1034.3 678.5,982.3 		"/>
-		<path d="M690.5,318.7c0.4,0.7,0.8,1.4,1.1,2.2l0.1,0.4c0.4,0.8,0.8,1.7,1.3,2.5c1.3,2.8,2.5,5.7,3.6,8.9c0.3,0.7,0.6,1.5,0.8,2.5
+		<polygon fill="#ffffff" points="616.5,930.1 548.3,957.4 548.3,1034.3 678.5,982.3 		"/>
+		<path fill="#ffffff" d="M690.5,318.7c0.4,0.7,0.8,1.4,1.1,2.2l0.1,0.4c0.4,0.8,0.8,1.7,1.3,2.5c1.3,2.8,2.5,5.7,3.6,8.9c0.3,0.7,0.6,1.5,0.8,2.5
 			l0.1,0.3c0,0.3,0.1,0.4,0.3,0.7c0.3,0.6,0.4,1.3,0.6,1.8c0.1,0.6,0.4,1.3,0.6,2c0.7,2.2,1.1,4,1.5,5.7c0.3,1,0.4,2,0.7,2.9
 			c0.1,0.6,0.3,1,0.3,1.5c0.3,1.1,0.4,2.2,0.6,3.4c0.1,1.1,0.4,2.4,0.6,3.5v0.1c0.4,2.7,0.7,5.4,0.8,8.1c0.1,1.3,0.1,2.4,0.3,3.6
 			c0.1,2.9,0.3,5.6,0.3,8.1v1.8c0,0.3,0,0.6,0,0.8v0.4c0,0.3,0,0.6,0,0.8c0,0.8,0,1.8-0.1,2.7c0,1,0,2-0.1,2.9
@@ -23,7 +23,7 @@
 			c-1.4,1.4-30.3,32.5-39.8,57.8l156.8-62.5c4.9-4.7,10.2-10.1,12.4-12.1c30.4-29.7,61.7-60.6,84.9-97.4
 			c22.9-36.9,35.3-71.8,36.6-103.7c1.7-22.3-0.1-63.8-30.4-91.2c-6.6-5.9-13.7-11.7-20-16.9c-3.4-2.7-6.7-5.4-9.9-8.2l-7.3-6.1
 			l-8.1-6.7c0.1,0.1,0.1,0.3,0.3,0.4C688.7,315.3,689.5,316.9,690.5,318.7z"/>
-		<path d="M403.3,590.8l100.2-40.1c0-0.1,0-0.4,0-0.6l0,0V550c0-0.4,0-0.8,0-1.4c0-0.8,0-1.5,0.1-2.4c0-0.6,0-1.1,0.1-1.7
+		<path fill="#ffffff" d="M403.3,590.8l100.2-40.1c0-0.1,0-0.4,0-0.6l0,0V550c0-0.4,0-0.8,0-1.4c0-0.8,0-1.5,0.1-2.4c0-0.6,0-1.1,0.1-1.7
 			c0-0.7,0.1-1.3,0.1-2s0.1-1.3,0.1-2c0-0.6,0.1-1.1,0.1-1.5c0-0.7,0.1-1.4,0.3-2.1c0-0.4,0.1-0.8,0.1-1.3c0.1-0.7,0.1-1.5,0.3-2.2
 			c0-0.3,0.1-0.7,0.1-1c0.1-0.8,0.3-1.5,0.4-2.4c0-0.3,0.1-0.4,0.1-0.7c0.1-0.8,0.3-1.8,0.4-2.7l0,0c11.4-58.9,60.7-81.7,78.9-88.1
 			c0.1-0.7,0.3-1.4,0.3-2.1l0.1-0.6c0.1-0.7,0.3-1.5,0.3-2.4c0.1-0.8,0.1-1.5,0.1-2.4v-0.3c0-0.1,0-0.3,0-0.4c0-0.1,0-0.3,0-0.4v-1
@@ -33,7 +33,7 @@
 			c-1.1,1.1-2,2.1-2.9,3.1c-1.4,1.5-2.8,3.2-4.2,4.9c-0.8,1.1-1.7,2.2-2.7,3.4c-0.3,0.4-2.5,3.5-3.6,5.2c-0.8,1.1-1.5,2.4-2.2,3.5
 			c-0.7,1.1-1.4,2.4-2.1,3.6c-0.7,1.1-1.3,2.2-2,3.6c-1,1.8-1.8,3.8-2.7,5.6c-6.4,14.4-9.6,29.9-9.6,46.1c0,0.8,0,1.7,0,2.4l0.3,3.2
 			l-98.6,39.4L403.3,590.8z"/>
-		<path d="M712.3,705.6v-72.9L459.9,733.2l1.5-8c5.7-29.3,43-69,44.5-70.6l0.1-0.1l95.1-94c1-1,2-1.8,2.8-2.8
+		<path fill="#ffffff" d="M712.3,705.6v-72.9L459.9,733.2l1.5-8c5.7-29.3,43-69,44.5-70.6l0.1-0.1l95.1-94c1-1,2-1.8,2.8-2.8
 			c5.6-5.6,11-11.3,16.3-17.2c0.6-0.7,1.1-1.3,1.7-2l0.8-1c4-4.6,8.1-9.4,12.1-14.4c1.4-1.7,2.7-3.4,4-5c3.8-4.9,7.5-10.1,11.2-15.2
 			c1.1-1.5,2.1-3.1,3.2-4.7c1-1.4,1.8-2.8,2.8-4.2v-0.1c0.6-0.8,1-1.5,1.5-2.4l0.1-0.3c8.8-13.8,16.1-27.8,21.8-41.5
 			c0.4-1,0.8-2,1.1-2.8c0.4-1.1,0.8-2.2,1.3-3.2l0.8-2.4c0.7-2,1.4-4,2.1-6.1v-0.1c0.3-0.7,0.6-1.4,0.7-2.1v-0.1
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 825f46c..3c2526b 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -487,6 +487,10 @@ nav .sub.active a {
 	-moz-column-count: 3;
 	column-count: 3;
 }
+.entry span div.content.noline {
+	border-top: 0;
+	padding-top: 0px;
+}
 .entry span div.content div {
 	width:50%;
 	-webkit-column-count: 3;
diff --git a/site/templates/index.liquid b/site/templates/index.liquid
index b05590b..afb5de3 100644
--- a/site/templates/index.liquid
+++ b/site/templates/index.liquid
@@ -122,14 +122,14 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
 <div id="loader_rapper">
   <div id="loader_svg">
   <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="338.1 278.3 660.5 819.7" xml:space="preserve">
+     viewBox="338.1 276.3 660.5 819.7" xml:space="preserve">
     <defs>
       <mask id="rect">
         <rect x="320" y="1100" width="700" height="900" fill="#fff" id="loader_svg_status" />
       </mask>
     </defs>
     <g id="rapper">
-      <g fill="transparent" stroke="#000">
+      <g fill="transparent" stroke="#888" stroke-width="2">
         <path d="M720.7,802.9L659.5 827.3 790.3 937.6 930.1 881.7 998.6 939.5 998.6 866.8 926.7 806.2 789.5 860.9z"/>
         <path d="M721.2,711.6L340.2 863.7 405.8 919 549.2 861.8 695.4 985.1 552.2 1042.3 618.2 1098 994.4 947.6 928.4 891.9 788.8 947.8 642.5 824.5 789.5 765.7 789.5 690.6 721.2 633z 		"/>
         <path d="M616.5,930.1L548.3 957.4 548.3 1034.3 678.5 982.3z"/>
@@ -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"/>
       </g>
-      <g mask="url(#rect)" fill="#000">
+      <g mask="url(#rect)" stroke="#888" fill="#fff">
         <path d="M720.7,802.9L659.5 827.3 790.3 937.6 930.1 881.7 998.6 939.5 998.6 866.8 926.7 806.2 789.5 860.9z"/>
         <path d="M721.2,711.6L340.2 863.7 405.8 919 549.2 861.8 695.4 985.1 552.2 1042.3 618.2 1098 994.4 947.6 928.4 891.9 788.8 947.8 642.5 824.5 789.5 765.7 789.5 690.6 721.2 633z 		"/>
         <path d="M616.5,930.1L548.3 957.4 548.3 1034.3 678.5 982.3z"/>
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 @@
 <div class="entry page">
   <span>
     <span class="postname">{{page.title}}</span>
-		<img class="mainimg" src="{{page.image}}">
-    <div class="content">
-      {{page.body | newline_to_br}}
-    </div>
+		{% if page.image %}
+		  <img class="mainimg" src="{{page.image}}">
+      <div class="content">
+        {{page.body | newline_to_br}}
+      </div>
+		{% else %}
+      <div class="content noline">
+        {{page.body | newline_to_br}}
+      </div>
+		{% endif %}
   </span>
 </div>
-- 
cgit v1.2.3-70-g09d2


From e75bc9e99c672d774e1e935b37c73970d7b6d2c8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
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/public/assets/images')

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 = $('<div class="play"></div>')
     var $el = $(this)
+    if (! is_mobile) {
+      var $underlay = $('<div class="underlay"></div>')
+      $underlay.css("background-image", $el.css("background-image"))
+      $el.css("background-image", 'none')
+    }    
+    var $play = $('<div class="play"></div>')
     $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 = $('<iframe src="https://player.vimeo.com/video/' + vimeo_id + '?autoplay=1&title=0&byline=0&portrait=0" width="500" height="281" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>')
   $el.append($embed)
   if (! is_mobile) {
-    var $mask = $('<div class="mask"></div>')
-    $el.append($mask)
+//     var $mask = $('<div class="mask"></div>')
+//     $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 @@
   <span>
 		{% if page.image %}
       <span class="postname">{{page.title}}</span>
-			<div class="galnav">
-				<span class="prevbutton">PREVIOUS ASSET</span>
-				<span class="nextbutton">NEXT ASSET</span>
-			</div>
 		  <img class="mainimg" src="{{page.image}}">
       <div class="content">
         {{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 @@
 	<span>
 		<span class="postname">{{project.title}}</span>
 		<div class="galnav">
-			<span class="prevbutton">PREVIOUS ASSET</span>
-			<span class="nextbutton">NEXT ASSET</span>
+			<span class="prevbutton">PREVIOUS</span>
+			<span class="nextbutton">NEXT</span>
 		</div>
 		<div class="gallery" id="okgallery">
     {% for media in project.media %}
       {% if media.token %}
-        <div class="cell video" style="background-image:url({{ media.thumb }})" data-video="https://player.vimeo.com/video/{{ media.token }}" data-caption="{{ media.title }}"></div>
+        <div class="cell video" style="background-image:url({{ media.thumb }})" data-video="https://player.vimeo.com/video/{{ media.token }}" data-caption=""></div>
       {% else %}
         <div class="cell" data-caption="{{ media.caption }}"><img src="{{ media.uri }}"></div>
       {% endif %}
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 1b8d6b4..b29a289 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -139,6 +139,7 @@
           {% endfor %}
         </ol>
       </div>
+
     {% elsif type == 'meta' %}
       <input class="hidden" type="hidden" name="{{name}}" value="{{spec.value}}">
     {% else %}
-- 
cgit v1.2.3-70-g09d2