diff --git a/README.md b/README.md index 700def4..4a601d8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,5 @@ -# Ghost 2.0 Compatibility - -[Vapor 1.6](https://github.com/sethlilly/Vapor/releases/tag/v1.6.0) is compatible with Ghost 2.0. Thanks to [jamesejr](https://github.com/jamesejr) for making this happen! - # Deprecation Notice -**UPDATE 2018-08-22**: Remember when I said 1.5 would be the last release in the 1.x series? Yeah, scratch that. Thanks to [jamesejr](https://github.com/jamesejr) for the PR featured in the [1.6 release](https://github.com/sethlilly/Vapor/releases/tag/v1.6.0) to provide Vapor compatibility with Ghost 2.0. - **UPDATE**: Many thanks to [pokono](https://github.com/pokono) for the PR featured in the [1.5 release](https://github.com/sethlilly/Vapor/tree/v1.5.0) to bring Vapor up to compatibility with Ghost 1.0+. I’ve released that as the final release in the 1.x series. Moving forward, only 2.x releases will be maintained. With the [release of Ghost 1.0.0](https://blog.ghost.org/1-0/), Vapor 1.x is deprecated. Vapor 2.0.0 with full support for Ghost 1.0.0+ is coming, and as soon as I know when that will be, I'll update this repo with information. Thanks to everyone who has forked, contributed, and used Vapor! I'm looking forward to the next version. @@ -42,7 +36,6 @@ See the [changelog](CHANGELOG.md) for release details. | Version | Release Date | | :-----: | :----------: | -| 1.6 | 2018-08-22 | | 1.5 | 2018-04-23 | | 1.4 | 2014-04-19 | | 1.3 | 2014-01-12 | diff --git a/assets/css/screen.css b/assets/css/screen.css index dd01d2e..a23e821 100644 --- a/assets/css/screen.css +++ b/assets/css/screen.css @@ -520,3 +520,184 @@ table tfoot { display: block; } } + +/* 5. Site Navigation +/* ---------------------------------------------------------- */ + +.site-nav { + position: relative; + z-index: 300; + display: flex; + justify-content: space-between; + align-items: flex-start; + overflow-y: hidden; + height: 40px; + font-size: 1.2rem; +} + +.site-nav-left { + display: flex; + align-items: justify; + overflow-x: auto; + overflow-y: hidden; + -webkit-overflow-scrolling: touch; + margin-right: 10px; + padding-bottom: 80px; + letter-spacing: 0.4px; + white-space: nowrap; + + -ms-overflow-scrolling: touch; +} + +/* Site Nav Hack Explanation (above): + +What's happening above it .site-nav-left is set to overflow-x and allow sideways scrolling, so that when there isn't enough space for all nav items (either due to lots of nav items, or a small viewport), you can still scroll side-to-side to reach them. + +The knock-on effect of this is ugly browser-scroll bars at the bottom, so 80px of padding-bottom and a 40px fixed height parent (.site-nav) hides that entirely. Slightly hacky code. But nice clean end-result. + +*/ + +.site-nav-logo { + flex-shrink: 0; + display: block; + margin-right: 24px; + padding: 11px 0; + color: #000; + font-size: 1.7rem; + line-height: 1em; + font-weight: bold; + letter-spacing: -0.5px; +} + +.site-nav-logo:hover { + text-decoration: none; +} + +.site-nav-logo img { + display: block; + width: auto; + height: 21px; +} + +.nav { + display: flex; + margin: 0 0 0 -12px; + padding: 0; + list-style: none; +} + +.nav li { + display: block; + margin: 0; + padding: 0; + text-transform: uppercase; +} + +.nav li a { + display: block; + margin: 0; + padding: 10px 12px; + color: #000; + opacity: 0.8; +} + +.nav li a:hover { + text-decoration: none; + opacity: 1; +} + +.site-nav-right { + flex-shrink: 0; + display: flex; + align-items: center; + height: 40px; +} + +.social-links { + flex-shrink: 0; + display: flex; + align-items: center; +} + +.social-links a:last-of-type { + padding-right: 20px; +} + +.social-link { + display: flex; + justify-content: center; + align-items: center; + margin: 0; + padding: 10px; + color: #fff; + opacity: 0.8; +} + +.social-link:hover { + opacity: 1; +} + +.social-link svg { + height: 1.8rem; + fill: #000; +} + +.social-link-fb svg { + height: 1.5rem; +} + +.social-link-wb svg { + height: 1.6rem; +} + +.social-link-wb svg path { + stroke: #000; +} + +.social-link-rss svg { + height: 1.9rem; +} + +.subscribe-button { + display: block; + padding: 4px 10px; + border: #000 1px solid; + color: #000; + font-size: 1.2rem; + line-height: 1em; + border-radius: 10px; + opacity: 0.8; +} + +.subscribe-button:hover { + text-decoration: none; + opacity: 1; +} + +.rss-button { + opacity: 0.8; +} + +.rss-button:hover { + opacity: 1; +} + +.rss-button svg { + margin-bottom: 1px; + height: 2.1rem; + fill: #000; +} + +@media (max-width: 700px) { + .site-header { + padding-right: 0; + padding-left: 0; + } + .site-nav-left { + margin-right: 0; + padding-left: 4vw; + } + .site-nav-right { + display: none; + } +} diff --git a/default.hbs b/default.hbs index 3d188e6..8384c93 100644 --- a/default.hbs +++ b/default.hbs @@ -23,7 +23,7 @@ {{#if @blog.logo}}{{/if}}

{{@blog.title}}

{{> header-description}} - {{!> menu}} + {{> menu}} {{{body}}} diff --git a/partials/menu.hbs b/partials/menu.hbs index 587730a..d2d1858 100644 --- a/partials/menu.hbs +++ b/partials/menu.hbs @@ -1,7 +1,7 @@ - \ No newline at end of file + diff --git a/post.hbs b/post.hbs index b4f534d..6c5a113 100644 --- a/post.hbs +++ b/post.hbs @@ -31,25 +31,14 @@ - - - +{{>comments-google-plus}} + {{!> comments-disqus}} + {{!> comments-facebook}} + {{/post}} - {{!> comments-disqus}} - {{!> comments-facebook}} - {{!> comments-google-plus}} + +