From 448082bd48847b047f100cbc73557d1f93fdb254 Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Sun, 20 Jul 2014 16:43:44 +0200 Subject: [PATCH] New navigation structure to make way for MU changes --- assets/css/screen.css | 235 ++++++++++++++++++++++++++++++---------- assets/fonts/icons.eot | Bin 2252 -> 2380 bytes assets/fonts/icons.svg | 1 + assets/fonts/icons.ttf | Bin 2096 -> 2224 bytes assets/fonts/icons.woff | Bin 1816 -> 1896 bytes default.hbs | 9 +- page.hbs | 29 ++--- post.hbs | 83 +++++++------- tag.hbs | 15 ++- 9 files changed, 235 insertions(+), 137 deletions(-) diff --git a/assets/css/screen.css b/assets/css/screen.css index 7e68a8c..db5f4ce 100644 --- a/assets/css/screen.css +++ b/assets/css/screen.css @@ -117,11 +117,7 @@ table { border-collapse: collapse; border-spacing: 0; } } /* Apply these base styles to all icons */ -.icon-ghost:before, -.icon-feed:before, -.icon-twitter:before, -.icon-google-plus:before, -.icon-facebook:before { +[class^="icon-"], [class*=" icon-"] { font-family: "icons"; speak: none; font-style: normal; @@ -129,7 +125,7 @@ table { border-collapse: collapse; border-spacing: 0; } font-variant: normal; text-transform: none; line-height: 1; - text-decoration: none; + text-decoration: none !important; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -152,6 +148,10 @@ table { border-collapse: collapse; border-spacing: 0; } .icon-facebook:before { content: "\e004"; } +.icon-arrow-left:before { + content: "\e005"; +} + /* ========================================================================== @@ -162,6 +162,7 @@ html { height: 100%; max-height: 100%; font-size: 62.5%; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } body { @@ -194,7 +195,7 @@ h4, h5, h6 { -o-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1; font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1; color: #2E2E2E; - line-height: 1.3em; + line-height: 1.15em; margin: 0 0 0.5em 0; font-family: "Open Sans", sans-serif; } @@ -241,6 +242,10 @@ h4 a, h5 a, h6 a { color: #50585D; } +.post-template .post-title { + margin-bottom: 3.4rem; +} + p, ul, ol, dl { -webkit-font-feature-settings: 'liga' 1, 'onum' 1, 'kern' 1; -moz-font-feature-settings: 'liga' 1, 'onum' 1, 'kern' 1; @@ -647,6 +652,85 @@ margin on the iframe, cause it breaks stuff. */ 5. Single Post - When you click on an individual post ========================================================================== */ +.main-nav { + position: relative; + padding: 15px; + margin: 0 0 30px 0; +} + +.back-button { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + display: inline-block; + float: left; + height: 40px; + padding: 0 15px 0 10px; + border: transparent 1px solid; + color: #9EABB3; + text-align: center; + font-size: 12px; + text-transform: uppercase; + line-height: 37px; + border-radius: 3px; + transition: all ease 0.3s; +} +.back-button:before { + position: relative; + bottom: -2px; + font-size: 13px; + line-height: 0; + margin-right: 8px; +} + +.subscribe-button { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + display: inline-block; + float: right; + height: 40px; + padding: 0 20px; + border: transparent 1px solid; + color: #9EABB3; + text-align: center; + font-size: 12px; + text-transform: uppercase; + line-height: 37px; + border-radius: 40px; + transition: all ease 0.3s; +} +.subscribe-button:before { + font-size: 9px; + margin-right: 6px; +} + +/* Special styles when overlaid on an image*/ +.main-nav.overlay { + position: absolute; + top: 0; + left: 0; + right: 0; + border: none; +} + +.main-nav.overlay a { + color: rgba(255,255,255,0.7); +} + +.main-nav.overlay a:hover { + color: #fff; + border-color: #fff; + background: transparent; +} + +/* Add a border to the buttons on hover */ +.back-button:hover, +.subscribe-button:hover { + border-color: #bfc8cd; + color: #9EABB3; +} + /* Stop .full-img from creating horizontal scroll - slight hack due to imperfections with browser width % calculations and rounding */ .post-template .content { @@ -776,38 +860,6 @@ margin on the iframe, cause it breaks stuff. */ } -/* ========================================================================== - 6. Tag archive - ========================================================================== */ - -.tag-archive-header { - position: relative; - max-width: 700px; - margin: 4rem auto; - border-bottom: 1px solid #EBF2F6; - padding: 20px 0; - text-align: center; - color: #222; -} - -.tag-archive-header:after { - display: block; - content: ""; - width: 7px; - height: 7px; - border: #E7EEF2 1px solid; - position: absolute; - bottom: -5px; - left: 50%; - margin-left: -5px; - background: #FFF; - -webkit-border-radius: 100%; - -moz-border-radius: 100%; - border-radius: 100%; - box-shadow: #FFF 0 0 0 5px; -} - - /* ========================================================================== 7. Third Party Elements - Embeds from other services ========================================================================== */ @@ -884,37 +936,33 @@ margin on the iframe, cause it breaks stuff. */ .site-footer { position: relative; margin: 8rem 0 0 0; - padding: 4rem 0; + padding: 0.5rem 35px; border-top: #EBF2F6 1px solid; font-family: "Open Sans", sans-serif; - font-size: 1.3rem; + font-size: 1rem; line-height: 1.7em; color: #BBC7CC; - text-align: center; - background: #F7FAFB; } .site-footer a { color: #BBC7CC; - text-decoration: underline; + text-decoration: none; + font-weight: bold; } .site-footer a:hover { color: #50585D; } -.poweredby .icon-ghost { - font-weight: 700; - text-decoration: none; +.poweredby { + display: block; + float: right; + text-align: right; } -.poweredby .icon-ghost:hover { - text-decoration: none; -} - -.poweredby .icon-ghost:before { - font-size: 1rem; - margin-right: 0.2em; +.copyright { + display: block; + float: left; } /* The subscribe icon on the footer */ @@ -938,7 +986,7 @@ margin on the iframe, cause it breaks stuff. */ color: #D2DEE3; font-size: 10px; position: absolute; - top: 9px; + top: 2px; left: 9px; font-weight: 700; transition: color 0.5s ease; @@ -957,7 +1005,8 @@ margin on the iframe, cause it breaks stuff. */ /* CSS tooltip saying "Subscribe!" - initially hidden */ .tooltip { opacity: 0; - display: inline-block; + display: block; + width: 52px; padding: 4px 8px 5px 8px; position:absolute; top: -23px; @@ -1062,6 +1111,10 @@ margin on the iframe, cause it breaks stuff. */ @media only screen and (max-width: 900px) { + .main-nav { + padding: 10px; + } + blockquote { margin-left: 0; } @@ -1097,6 +1150,10 @@ margin on the iframe, cause it breaks stuff. */ padding: 40px 0; } + hr { + margin: 2.4em 0; + } + ol, ul { padding-left: 2em; } @@ -1126,6 +1183,10 @@ margin on the iframe, cause it breaks stuff. */ font-size: 1.8rem; } + .site-footer { + padding: 0.5rem 15px; + } + } @@ -1135,6 +1196,51 @@ margin on the iframe, cause it breaks stuff. */ @media only screen and (max-width: 500px) { + .site-head { + margin-bottom: 0; + } + + .main-nav { + padding: 0; + margin-bottom: 2rem; + border-bottom: #e0e4e7 1px solid; + } + + .back-button, + .subscribe-button { + height: 44px; + line-height: 41px; + border-radius: 0; + color: #2e2e2e; + } + .back-button:hover, + .subscribe-button:hover { + border-color: #ebeef0; + color: #2e2e2e; + background: #ebeef0; + } + + .back-button { + padding: 0 15px 0 10px; + } + + .subscribe-button { + padding: 0 12px; + } + + .main-nav.overlay { + color: #fff; + background: rgba(0,0,0,0.4); + background: -moz-linear-gradient(top, rgba(0,0,0,0.4) 0%, rgba(0,0,0,0) 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0.4)), color-stop(100%,rgba(0,0,0,0))); + background: -webkit-linear-gradient(top, rgba(0,0,0,0.4) 0%,rgba(0,0,0,0) 100%); + background: linear-gradient(to bottom, rgba(0,0,0,0.4) 0%,rgba(0,0,0,0) 100%); + } + .main-nav.overlay a:hover { + border-color: transparent; + background: transparent; + } + .blog-logo img { max-height: 80px; } @@ -1148,14 +1254,25 @@ margin on the iframe, cause it breaks stuff. */ .post { width: auto; + margin-top: 2rem; + margin-bottom: 2rem; margin-left: 16px; margin-right: 16px; + padding-bottom: 2rem; font-size: 0.8em; line-height: 1.6em; } + .post-template .post-title { + margin-bottom: 2rem; + } + + hr { + margin: 1.6em 0; + } + p, ul, ol, dl { - margin: 0 0 1.6em 0; + margin: 0 0 2rem 0; } .site-head { @@ -1164,6 +1281,7 @@ margin on the iframe, cause it breaks stuff. */ .blog-title { font-size: 3rem; + margin: 0; } .blog-description { @@ -1271,8 +1389,7 @@ margin on the iframe, cause it breaks stuff. */ } .site-footer { - margin-top: 6rem; - font-size: 1.1rem; + margin-top: 3rem; } } diff --git a/assets/fonts/icons.eot b/assets/fonts/icons.eot index fe569d267d9ea855a3aa6ef4b9347a40a8359889..b220c913720c6b382e65e36e6f15afa3c4081e44 100755 GIT binary patch delta 406 zcmXAk&r1SP5XWbB_wD+FRWvc^r-W&TFfq}Kgiv(yAXF!XT1=E^-K{)$^P;CN$s-8r z&|eTmhb|qYn^qhin^6HyA8~n`Fv;Qy*GVd-_LSRfZGmBOOexYp_4UyD**6F zzE{#UGqlq!cDggo-nd77XacZ!wXE%n!bBTDzNWrZl?3HUd?tP+4p;ShV+wGd_=kAu z&?sr_SR4W_!X`r zyMM<|sY%!Sg@IUuS%Aek49JQH7a~!NVKSA*HB1C2ZPkgwfXOmrs;aV)VWrry!AeIQ z^$n(aRAw2T+bIRhEOpcxwE*c8p!MjR5t(s delta 276 zcmX>jbViW%3)!9-SbmfvAUrzSe&3+gd2Fzf;1gyh`B0)@~6(Gw5I)PLO;Jd=Te zv4DYrq)-aNhFk85lh|f!&;ubMg#! tmB|O#Mc6>f88|23V=rXXm>j?n3?!FugfO~KX6969Vql(Z$SDo7696*~LaG1& diff --git a/assets/fonts/icons.svg b/assets/fonts/icons.svg index 2e0e2d3..1d2d599 100755 --- a/assets/fonts/icons.svg +++ b/assets/fonts/icons.svg @@ -12,4 +12,5 @@ + \ No newline at end of file diff --git a/assets/fonts/icons.ttf b/assets/fonts/icons.ttf index c7d06674a575d1d38177b6e8429103a8ea5aceee..3f8ccc0087c3073a4b266a3972ccb4f8bc33e96a 100755 GIT binary patch delta 432 zcmW-d%S!@L6voe)@y_^Qe3TeOnT0)Qkz%3*5f||^ng`<`(Y-J1EYf})^ zqQ4-77PV**?IfseTbH>jXqVQxbKu_Z{Jsm9@0^yq<*5MzfCElJgz$Pg6md3tA#$GR z>}7Pd6xe#+0l*RBR8B3INZrI5sWq2BIc)#6ZN%iWu$EO1L}Bm@K)R*(m_~;DBEAxT z5C=8AQXK{yBmO0x$rm#VDmxat0CJEFpRQI*;DHC?1aY9C>e;)ENROC@m@gH}6$(ma zZ8RTOk)7i*vil@{TWa*}fY1>OFbXi~N3SG1abjv3=P(+J<03|UL#As(p~EDJF-1{W zzsOr`n!ww>fqIfDPKEKpOS2{6#od0rUpH4qYrBr5y1TB#4>&9UE(-Pjm83w~IG8=Mto29Q4i#Lvl3woGKY#rz5=umva}lABmj05pC(kbeTmSIA4uP2J-!{}jl70klND zAiuZ-=ujZw5SX~bosne{qcbDRW*5d!EJ{E@pjXVVYwd{VxB1Gz%>q)!aNhFk85lkJ z2%9-0=j1IR-C=IgDCNVoXWkkl>u`#9qj#F?kDnFp%Wn2w`-eoX(*> Ic>;$50Q!7GhyVZp diff --git a/assets/fonts/icons.woff b/assets/fonts/icons.woff index 1ea9b971104a257af979b05445abddd15c56c157..4ac6c21804b0f41b292b6268ee1006d6de0bc1c7 100755 GIT binary patch delta 476 zcmXw$%S&597{$-rXS`RF_{I`3N_>lkG}etP#ppsvz_<_vy{IG$qk;*#@TzDFEf*^3 zxX4{9uDkIckZy}gp+Z-#x^SrrAxcEQ@iFi_Gw005@XbuYd+n`TkH=#1WHJuuX&9iP z2f;Yg>+(J3_7xys?Vs#5#3%Y9fby62=LFvTW8ZwnS_RZ7`EfyT@^mI;t%+=hyyp#n zdeK^->?`?C0$Hm5lBSTdQ}Q8!{!9Ly&SWeZ0Ipg^ZLsK5fw*sQcG-O61j1$HA1-RCZ9UE9go_LiM>wp>rCwb-fJu5;+R zo}yS6+#{!8zt(t4tmH2es`ufb=HZ~$DL42JWrV5xpE67uP@{qAC#P-JH+TnAp*Dew z+tlaxnJ=jW%;3jr$WXwVfCOOhb9IVEd51PZx~V127*?>1EP_b!KU%xeOE;yDtLJ`Q Fe+CxcaFqZ6 delta 396 zcmaFCH-k^C+~3X3KP1GTfq`9ufr|kM*e){HvFon^*u8`vTmJ{NfUzk{=UaxGQ$>%L0}53W7*ZAi+FEh=Gfdk&T;|Ur1a=QB8YtAfuKX z0|OIdCj&bJCldoB0}GJB#lXvu!f=)`o~eoH - -
-
All content copyright {{@blog.title}} © {{date format="YYYY"}} • All rights reserved.
-
Proudly published with Ghost
-
+ {{! Ghost outputs important scripts and data with this tag }} diff --git a/page.hbs b/page.hbs index 45073e1..65cb102 100644 --- a/page.hbs +++ b/page.hbs @@ -3,30 +3,23 @@ {{! This is a page template. A page outputs content just like any other post, and has all the same attributes by default, but you can also customise it to behave differently if you prefer. }} + +
diff --git a/post.hbs b/post.hbs index 13456a7..5bfcb52 100644 --- a/post.hbs +++ b/post.hbs @@ -3,63 +3,54 @@ {{! The comment above "< default" means - insert everything in this file into the {body} of the default.hbs template, which contains our header/footer. }} + +
+ {{! Everything inside the #post tags pulls data from the post }} + {{#post}} - {{! Each post has the blog logo at the top, with a link back to the home page }} -
- -
+

{{{title}}}

- {{! Everything inside the #post tags pulls data from the post }} - {{#post}} +
+ {{content}} +
- {{tags prefix="on " separator=" | "}} + + {{/post}}
diff --git a/tag.hbs b/tag.hbs index ae94dcd..ea31293 100644 --- a/tag.hbs +++ b/tag.hbs @@ -5,11 +5,14 @@ {{! The big featured header on the homepage, with the site logo and description }}
+
- {{#if @blog.logo}}{{/if}} -

{{@blog.title}}

-

{{@blog.description}}

+

{{tag.name}}

+

A {{pagination.total}}-post collection

@@ -17,10 +20,6 @@ {{! The main content area on the homepage }}
-
-

{{tag.name}}

-
- {{! Each post will be output using this markup }} {{#foreach posts}} @@ -37,7 +36,7 @@ {{/foreach}} - {{!! After all the posts, we have the previous/next pagination links }} + {{! After all the posts, we have the previous/next pagination links }} {{pagination}}
\ No newline at end of file