Skip to content

Commit

Permalink
Merge branch 'master' into flexible-home-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
DirtyF authored Dec 28, 2017
2 parents 969dc8a + 481e757 commit 2924632
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 16 deletions.
7 changes: 4 additions & 3 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<footer class="site-footer">
<footer class="site-footer h-card">
<data class="u-url" href="{{ "/" | relative_url }}"></data>

<div class="wrapper">

Expand All @@ -7,15 +8,15 @@ <h2 class="footer-heading">{{ site.title | escape }}</h2>
<div class="footer-col-wrapper">
<div class="footer-col footer-col-1">
<ul class="contact-list">
<li>
<li class="p-name">
{% if site.author %}
{{ site.author | escape }}
{% else %}
{{ site.title | escape }}
{% endif %}
</li>
{% if site.email %}
<li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
<li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
{% endif %}
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<div class="wrapper">
{% assign default_paths = site.pages | map: "path" %}
{% assign page_paths = site.header_pages | default: default_paths %}
<a class="site-title" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
<a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>

{% if page_paths %}
<nav class="site-nav">
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
Expand Down
2 changes: 1 addition & 1 deletion _includes/icon-github.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<a href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>
<a class="u-url" rel="me" href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>
2 changes: 1 addition & 1 deletion _includes/icon-twitter.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<a href="https://twitter.com/{{ include.username }}"><span class="icon icon--twitter">{% include icon-twitter.svg %}</span><span class="username">{{ include.username }}</span></a>
<a class="u-url" rel="me" href="https://twitter.com/{{ include.username }}"><span class="icon icon--twitter">{% include icon-twitter.svg %}</span><span class="username">{{ include.username }}</span></a>
12 changes: 7 additions & 5 deletions _layouts/post.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
---
layout: default
---
<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
<article class="post h-entry" itemscope itemtype="http://schema.org/BlogPosting">

<header class="post-header">
<h1 class="post-title" itemprop="name headline">{{ page.title | escape }}</h1>
<h1 class="post-title p-name" itemprop="name headline">{{ page.title | escape }}</h1>
<p class="post-meta">
<time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
<time class="dt-published" datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
{{ page.date | date: date_format }}
</time>
{% if page.author %}
<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>
<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span class="p-author h-card" itemprop="name">{{ page.author }}</span></span>
{% endif %}</p>
</header>

<div class="post-content" itemprop="articleBody">
<div class="post-content e-content" itemprop="articleBody">
{{ content }}
</div>

{% if site.disqus.shortname %}
{% include disqus_comments.html %}
{% endif %}

<a class="u-url" href="{{ page.url | relative_url }}" hidden></a>
</article>
4 changes: 0 additions & 4 deletions minima.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ Gem::Specification.new do |spec|
f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README)((\.(txt|md|markdown)|$)))}i)
end

spec.bindir = "exe"
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

spec.add_runtime_dependency "jekyll", "~> 3.5"
spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.1"

spec.add_development_dependency "bundler", "~> 1.12"
end

0 comments on commit 2924632

Please sign in to comment.