Skip to content

Commit 5f2f19d

Browse files
sondr3sondr3
committed
Update to latest Jekyll theme and settings
1 parent c1a9e25 commit 5f2f19d

File tree

12 files changed

+41
-33
lines changed

12 files changed

+41
-33
lines changed

‎generators/jekyll/templates/app/_includes/footer.html‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,22 @@ <h2 class="footer-heading">{{ site.title }}</h2>
1414

1515
<div class="footer-col footer-col-2">
1616
<ul class="social-media-list">
17+
{% if site.author.github %}
1718
<li>
18-
<a href="https://twitter.com/{{ site.author.twitter }}">
19-
<span class="icon icon--twitter">
20-
<svg viewBox="0 0 16 16">
21-
<path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
22-
c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27
23-
c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767
24-
c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206
25-
C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271
26-
c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469
27-
c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
28-
</svg>
29-
</span>
30-
31-
<span class="username">{{ site.author.twitter }}</span>
32-
</a>
19+
{% include icon-github.html username=site.author.github %}
3320
</li>
21+
{% endif %}
22+
23+
{% if site.author.twitter %}
24+
<li>
25+
{% include icon-twitter.html username=site.author.twitter %}
26+
</li>
27+
{% endif %}
3428
</ul>
3529
</div>
3630

3731
<div class="footer-col footer-col-3">
38-
<p class="text">{{ site.description }}</p>
32+
<p>{{ site.description }}</p>
3933
</div>
4034
</div>
4135

‎generators/jekyll/templates/app/_includes/head.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<meta http-equiv="X-UA-Compatible" content="IE=edge">
44
<meta name="viewport" content="width=device-width, initial-scale=1">
55

6-
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}</title>
6+
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
77
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
88
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
99

‎generators/jekyll/templates/app/_includes/header.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<div class="wrapper">
44

5-
<a class="site-title" href="/">{{ site.name }}</a>
5+
<a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
66

77
<nav class="site-nav">
88
<a href="#" class="menu-icon">
@@ -14,8 +14,11 @@
1414
</a>
1515

1616
<div class="trigger">
17-
<a class="page-link" href="/about/">About</a>
18-
<a class="page-link" href="/">Home</a>
17+
{% for my_page in site.pages %}
18+
{% if my_page.title != "404: Page not found" %}
19+
<a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
20+
{% endif %}
21+
{% endfor %}
1922
</div>
2023
</nav>
2124

‎generators/jekyll/templates/app/_layouts/default.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
2+
<html>
33

44
{% include head.html %}
55

@@ -20,4 +20,5 @@
2020
<!-- endinject -->
2121

2222
</body>
23+
2324
</html>

‎generators/jekyll/templates/app/_layouts/page.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ <h1 class="post-title">{{ page.title }}</h1>
1010
<div class="post-content">
1111
{{ content }}
1212
</div>
13+
1314
</article>

‎generators/jekyll/templates/app/_layouts/post.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<header class="post-header">
77
<h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
8-
<p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
8+
<p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>
99
</header>
1010

1111
<div class="post-content" itemprop="articleBody">

‎generators/jekyll/templates/app/about.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ title: About
44
permalink: /about/
55
---
66

7-
This is the base Jekyll theme. You can find out more info about customizing your
8-
Jekyll theme, as well as basic Jekyll usage documentation at
9-
[jekyllrb.com](http://jekyllrb.com/)
7+
This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
108

119
You can find the source code for the Jekyll new theme at:
12-
[github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
10+
{% include icon-github.html username="jglovier" %} /
11+
[jekyll-new](https://github.com/jglovier/jekyll-new)
1312

1413
You can find the source code for Jekyll at
15-
[github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
14+
{% include icon-github.html username="jekyll" %} /
15+
[jekyll](https://github.com/jekyll/jekyll)

‎generators/jekyll/templates/app/assets/scss/layout.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
.site-title {
1414
font-size: 26px;
15+
font-weight: 300;
1516
line-height: 56px;
1617
letter-spacing: -1px;
1718
margin-bottom: 0;

‎generators/jekyll/templates/app/assets/scss/main.scss‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Our variables
44
$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
55
$base-font-size: 16px;
6-
$base-font-weight: 300;
6+
$base-font-weight: 400;
77
$small-font-size: $base-font-size * 0.875;
88
$base-line-height: 1.5;
99

@@ -23,7 +23,9 @@ $content-width: 800px;
2323
$on-palm: 600px;
2424
$on-laptop: 800px;
2525

26-
// Using media queries with like this:
26+
27+
28+
// Use media queries like this:
2729
// @include media-query($on-palm) {
2830
// .wrapper {
2931
// padding-right: $spacing-unit / 2;

‎generators/jekyll/templates/app/assets/scss/syntax-highlighting.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
background: #fff;
66
@extend %vertical-rhythm;
77

8+
.highlighter-rouge & {
9+
background: #eef;
10+
}
11+
812
.c { color: #998; font-style: italic } // Comment
913
.err { color: #a61717; background-color: #e3d2d2 } // Error
1014
.k { font-weight: bold } // Keyword

0 commit comments

Comments
 (0)