Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added built in menus and activated google comments #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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 |
Expand Down
181 changes: 181 additions & 0 deletions assets/css/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion default.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{#if @blog.logo}}<a id="blog-logo" href="{{@blog.url}}"><div class="bloglogo" style="background: url({{@blog.logo}})"></div></a>{{/if}}
<h1 class="blog-title"><a href="{{@blog.url}}">{{@blog.title}}</a></h1>
{{> header-description}}
{{!> menu}}
{{> menu}}
</header>

{{{body}}}
Expand Down
14 changes: 7 additions & 7 deletions partials/menu.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<nav class="menu" role="nav">
<ul>
<li><a href="">Item One</a></li>
<li><a href="">Item Two</a></li>
<li><a href="">Item Three</a></li>
</ul>
</nav>
<nav class="site-nav">
<div class="site-nav-left">
{{#if @blog.navigation}}
{{navigation}}
{{/if}}
</div>
</nav>
23 changes: 6 additions & 17 deletions post.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,14 @@
<i class="fa fa-2x fa-fw fa-google-plus-square"></i> <span class="hidden">Google+</span>
</a>
</section>

<footer class="post-footer">

{{#if primary_author}}
<section class="author">
<div class="authorimage" style="background: url({{primary_author.profile_image}})"></div>
<p class="attr">Author</p>
<h4><a href="{{primary_author.website}}">{{primary_author.name}}</a></h4>
<p class="bio">{{primary_author.bio}}</p>
</section>
{{/if}}

</footer>

{{>comments-google-plus}}
{{!> comments-disqus}}
{{!> comments-facebook}}

{{/post}}

{{!> comments-disqus}}
{{!> comments-facebook}}
{{!> comments-google-plus}}



</article>

Expand Down