diff options
| -rw-r--r-- | site/db.json | 2 | ||||
| -rw-r--r-- | site/public/assets/images/2H_LOGOMARK.svg | 12 | ||||
| -rw-r--r-- | site/public/assets/style.css | 4 | ||||
| -rw-r--r-- | site/templates/index.liquid | 6 | ||||
| -rw-r--r-- | site/templates/page.liquid | 14 |
5 files changed, 24 insertions, 14 deletions
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> |
