Skip to content

Commit 8461cff

Browse files
jth0jth0
committed
remove some minima 2.5x stuff, add disqus, GA tag, remove authors stuff
1 parent 301c212 commit 8461cff

17 files changed

+105
-206
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎404.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
2-
permalink: /404.html
3-
layout: page
2+
layout: base
43
---
54

65
<style type="text/css" media="screen">

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source "https://rubygems.org"
99
# Happy Jekylling!
1010
# gem "jekyll", "~> 4.4.1"
1111
# This is the default theme for new Jekyll sites. You may change this to anything you like.
12-
gem "minima", "~> 2.5.1"
12+
#gem "minima", "~> 2.5.1"
1313
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
1414
# uncomment the line below. To upgrade, run `bundle update github-pages`.
1515
gem "github-pages", group: :jekyll_plugins

‎Gemfile.lock

-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ DEPENDENCIES
311311
jekyll-sass-converter (~> 1.5.2)
312312
jekyll-sitemap (~> 1.4.0)
313313
jekyll-titles-from-headings (~> 0.5.3)
314-
minima (~> 2.5.1)
315314
tzinfo (>= 1, < 3)
316315
tzinfo-data
317316
wdm (~> 0.1)

‎_authors/john.md

-56
This file was deleted.

‎_config.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
# in the templates via {{ site.myvariable }}.
2020

2121
title: My Awesome Site
22-
author: john
22+
author: John Hoffoss
23+
email: "[email protected]"
24+
image: "assets/images/me.jpg"
2325
description: >- # this means to ignore newlines until "baseurl:"
2426
This is my awesome site.
2527
It's pretty awesome.
@@ -28,6 +30,10 @@ description: >- # this means to ignore newlines until "baseurl:"
2830
domain: "jth0.github.io"
2931
baseurl: "" # the subpath of your site, e.g. /blog
3032
url: "https://jth0.github.io" # the base hostname & protocol for your site, e.g. http://example.com
33+
google_analytics: "G-E9JWMEP4TF"
34+
disqus:
35+
shortname: "jth"
36+
3137
exclude:
3238
- Gemfile
3339
- Gemfile.lock
@@ -98,11 +104,6 @@ header_pages:
98104
- index.md
99105
- about.md
100106
- blog/index.html
101-
- authors/index.html
102-
103-
collections:
104-
authors:
105-
output: true
106107

107108
defaults:
108109
# _posts
@@ -127,11 +128,6 @@ defaults:
127128
path: "assets/images"
128129
values:
129130
image: true
130-
- scope:
131-
path: ""
132-
type: "authors"
133-
values:
134-
layout: "author"
135131

136132
category_archive:
137133
type: liquid
@@ -188,7 +184,7 @@ minima:
188184
url: "https://facebook.com/john.t.hoffoss"
189185
- title: linkedin
190186
icon: linkedin
191-
url: "https://linkedin.com/in/john.t.hoffoss"
187+
url: "https://linkedin.com/in/johnhoffoss"
192188
- title: flickr
193189
icon: flickr
194190
url: "https://flickr.com/photos/minntc"

‎_data/navigation.yml

-8
This file was deleted.

‎_includes/disqus_comments.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
})();
1818
</script>
1919
<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
20-
{%- endif -%}
20+
{%- endif -%}

‎_includes/footer.html

+37-38
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
11
<footer class="site-footer h-card">
2-
<data class="u-url" href="{{ '/' | relative_url }}"></data>
3-
4-
<div class="wrapper">
5-
6-
<div class="footer-col-wrapper">
7-
<div class="footer-col">
8-
<p class="feed-subscribe">
9-
<a href="{{ site.feed.path | default: 'feed.xml' | absolute_url }}">
10-
<svg class="svg-icon orange">
11-
<path d="M12.8 16C12.8 8.978 7.022 3.2 0 3.2V0c8.777 0 16 7.223 16 16h-3.2zM2.194
12-
11.61c1.21 0 2.195.985 2.195 2.196 0 1.21-.99 2.194-2.2 2.194C.98 16 0 15.017 0
13-
13.806c0-1.21.983-2.195 2.194-2.195zM10.606
14-
16h-3.11c0-4.113-3.383-7.497-7.496-7.497v-3.11c5.818 0 10.606 4.79 10.606 10.607z"
15-
/>
16-
</svg><span>Subscribe</span>
17-
</a>
18-
</p>
19-
{%- if site.author %}
20-
{% assign author = site.authors | where: 'short_name', site.author | first %}
21-
<ul class="contact-list">
22-
{% if author.name -%}
23-
<li class="p-name">{{ author.name | escape }}</li>
24-
{% endif -%}
25-
{% if author.email -%}
26-
<li><a class="u-email" href="mailto:{{ author.email }}">{{ author.email }}</a></li>
27-
{%- endif %}
28-
</ul>
29-
{%- endif %}
2+
<data class="u-url" href="{{ '/' | relative_url }}"></data>
3+
4+
<div class="wrapper">
5+
6+
<div class="footer-col-wrapper">
7+
<div class="footer-col">
8+
<p class="feed-subscribe">
9+
<a href="{{ site.feed.path | default: 'feed.xml' | absolute_url }}">
10+
<svg class="svg-icon orange">
11+
<path d="M12.8 16C12.8 8.978 7.022 3.2 0 3.2V0c8.777 0 16 7.223 16 16h-3.2zM2.194
12+
11.61c1.21 0 2.195.985 2.195 2.196 0 1.21-.99 2.194-2.2 2.194C.98 16 0 15.017 0
13+
13.806c0-1.21.983-2.195 2.194-2.195zM10.606
14+
16h-3.11c0-4.113-3.383-7.497-7.496-7.497v-3.11c5.818 0 10.606 4.79 10.606 10.607z"
15+
/>
16+
</svg><span>Subscribe</span>
17+
</a>
18+
</p>
19+
{%- if site.author %}
20+
<ul class="contact-list">
21+
{% if site.author.name -%}
22+
<li class="p-name">{{ site.author.name | escape }}</li>
23+
{% endif -%}
24+
{% if site.author.email -%}
25+
<li><a class="u-email" href="mailto:{{ site.author.email }}">{{ site.author.email }}</a></li>
26+
{%- endif %}
27+
</ul>
28+
{%- endif %}
29+
</div>
30+
<div class="footer-col">
31+
<p>{{ site.description | escape }}</p>
32+
</div>
3033
</div>
31-
<div class="footer-col">
32-
<p>{{ site.description | escape }}</p>
34+
35+
<div class="social-links">
36+
{%- include social.html -%}
3337
</div>
38+
3439
</div>
35-
36-
<div class="social-links">
37-
{%- include social.html -%}
38-
</div>
39-
40-
</div>
41-
42-
</footer>
40+
41+
</footer>

‎_includes/head.html

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<head>
2-
<meta charset="utf-8">
3-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
4-
<meta name="viewport" content="width=device-width, initial-scale=1">
5-
{%- seo -%}
6-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@latest/css/all.min.css">
7-
<link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
8-
{%- feed_meta -%}
9-
{%- if jekyll.environment == 'production' and site.google_analytics -%}
10-
{%- include google-analytics.html -%}
11-
{%- endif -%}
12-
13-
{%- include custom-head.html -%}
2+
<meta charset="utf-8">
3+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
4+
<meta name="viewport" content="width=device-width, initial-scale=1">
5+
{%- seo -%}
6+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@latest/css/all.min.css">
7+
<link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
8+
{%- feed_meta -%}
9+
{%- if jekyll.environment == 'production' and site.google_analytics -%}
10+
{%- include google-analytics.html -%}
11+
{%- endif -%}
1412

15-
</head>
13+
{%- include custom-head.html -%}
14+
15+
</head>
16+

‎_includes/header.html

+30-29
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
<header class="site-header">
22

3-
<div class="wrapper">
4-
{%- assign default_paths = site.pages | map: "path" -%}
5-
{%- assign page_paths = site.header_pages | default: default_paths -%}
6-
{%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
7-
<a class="site-title" rel="author" href="{{ '/' | relative_url }}">{{ site.title | escape }}</a>
8-
9-
{%- if titles_size > 0 -%}
10-
<nav class="site-nav">
11-
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
12-
<label for="nav-trigger">
13-
<span class="menu-icon">
14-
<svg viewBox="0 0 18 15" width="18px" height="15px">
15-
<path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
16-
</svg>
17-
</span>
18-
</label>
19-
20-
<div class="trigger">
21-
{%- for path in page_paths -%}
22-
{%- assign my_page = site.pages | where: "path", path | first -%}
23-
{%- if my_page.title -%}
24-
<a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
25-
{%- endif -%}
26-
{%- endfor -%}
27-
</div>
28-
</nav>
29-
{%- endif -%}
30-
</div>
31-
</header>
3+
<div class="wrapper">
4+
{%- assign default_paths = site.pages | map: "path" -%}
5+
{%- assign page_paths = site.header_pages | default: default_paths -%}
6+
{%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
7+
<a class="site-title" rel="author" href="{{ '/' | relative_url }}">{{ site.title | escape }}</a>
8+
9+
{%- if titles_size > 0 -%}
10+
<nav class="site-nav">
11+
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
12+
<label for="nav-trigger">
13+
<span class="menu-icon">
14+
<svg viewBox="0 0 18 15" width="18px" height="15px">
15+
<path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
16+
</svg>
17+
</span>
18+
</label>
19+
20+
<div class="trigger">
21+
{%- for path in page_paths -%}
22+
{%- assign my_page = site.pages | where: "path", path | first -%}
23+
{%- if my_page.title -%}
24+
<a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
25+
{%- endif -%}
26+
{%- endfor -%}
27+
</div>
28+
</nav>
29+
{%- endif -%}
30+
</div>
31+
</header>
32+

‎_includes/social.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<ul class="social-media-list">
2-
{%- for entry in site.minima.social_links -%}
3-
<li>
4-
<a rel="me" href="{{ entry.url }}" target="_blank" title="{{ entry.title }}">
5-
<span class="grey fa-brands fa-{{ entry.icon }} fa-lg"></span>
6-
</a>
7-
</li>
8-
{%- endfor -%}
9-
</ul>
2+
{%- for entry in site.minima.social_links -%}
3+
<li>
4+
<a rel="me" href="{{ entry.url }}" target="_blank" title="{{ entry.title }}">
5+
<span class="grey fa-brands fa-{{ entry.icon }} fa-lg"></span>
6+
</a>
7+
</li>
8+
{%- endfor -%}
9+
</ul>

‎_layouts/author.html

-15
This file was deleted.

‎_layouts/post.html

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: base
33
---
4-
<article class="post h-entry" itemscope itemtype="https://schema.org/BlogPosting">
4+
<article class="post h-entry" itemscope itemtype="http://schema.org/BlogPosting">
55

66
<header class="post-header">
77
<h1 class="post-title p-name" itemprop="name headline">{{ page.title | escape }}</h1>
@@ -17,12 +17,10 @@ <h1 class="post-title p-name" itemprop="name headline">{{ page.title | escape }}
1717
{{ mdate | date: date_format }}
1818
</time>
1919
{%- endif -%}
20-
2120
{%- if page.author -%}
22-
{% for name in page.author %}
23-
{% assign author = site.authors | where: 'short_name', name | first %}
24-
<span itemprop="author" itemscope itemtype="https://schema.org/Person">
25-
<span class="p-author h-card" itemprop="name"><a href="{{ author.url }}">{{ author.name }}</a></span></span>
21+
• {% for author in page.author %}
22+
<span itemprop="author" itemscope itemtype="http://schema.org/Person">
23+
<span class="p-author h-card" itemprop="name">{{ author }}</span></span>
2624
{%- if forloop.last == false %}, {% endif -%}
2725
{% endfor %}
2826
{%- endif -%}</p>

0 commit comments

Comments
 (0)