Skip to content

Commit 3aebf3c

Browse files
logiclogic
committed
Structural improvements.
1 parent 8426a31 commit 3aebf3c

File tree

9 files changed

+116
-123
lines changed

9 files changed

+116
-123
lines changed

‎404.html

+21-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
1+
---
2+
title: "Four Oh Four"
3+
permalink: /404.html
4+
---
15
<!DOCTYPE html>
26
<html>
3-
<head>
4-
<title>{{ page.title }}</title>
5-
<link rel="stylesheet" type="text/css" href="/css/default.css" media="screen" />
6-
<link rel="alternate" type="application/atom+xml" title="Atom" href="/feeds/atom.xml" />
7-
<link rel="alternate" type="application/rss+xml" title="RSS" href="/feeds/rss.xml" />
8-
</head>
9-
<body>
10-
<h1 class="header">
11-
<a href="/">#</a>
12-
Beware of programmers carrying screwdrivers
13-
</h1>
14-
<div class="content">
15-
<h1 class="postTitle"><a href="/">Four Oh Four</a></h1>
16-
<div class="post">
17-
<p>Sorry, nothing here by that name.</p>
18-
</div>
19-
</div>
20-
<div class="footer">
21-
<ul class="links">
22-
<li><a href="/about.html">About me</a></li>
23-
<li><a href="http://esm.logic.net/">My real blog</a></li>
24-
<li><a href="http://www.flickr.com/photos/edward_marshall">Flickr</a></li>
25-
<li><a href="http://github.com/logic">Github</a></li>
26-
<li><a href="/feeds/atom.xml" rel="alternate" type="application/atom+xml">Atom</a>/<a href="/feeds/rss.xml" rel="alternate" type="application/rss+xml">RSS</a></li>
27-
</ul>
28-
</div>
7+
8+
{% include head.html %}
9+
10+
<body>
11+
12+
{% include header.html %}
13+
14+
<div class="page-content">
15+
<h1 class="postTitle"><a href="/">Four Oh Four</a></h1>
16+
<div class="post">
17+
<p>Sorry, nothing here by that name.</p>
18+
</div>
19+
</div>
20+
21+
{% include footer.html %}
22+
2923
</body>
24+
3025
</html>

‎_config.yml

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
title: Beware of programmers carrying screwdrivers
2-
email: [email protected]
3-
description: >
4-
Words about devops and engineering that occasionally form coherent thoughts.
1+
title: "Beware of programmers carrying screwdrivers"
2+
email: "[email protected]"
3+
description: "Words about devops and engineering. Occasionally coherent."
54
baseurl: ""
65
url: "http://code.logic.net"
7-
twitter_username: esm
8-
github_username: logic
6+
author:
7+
name: Ed Marshall
8+
email: [email protected]
9+
uri: "http://esm.logic.net/"
10+
twitter: "esm"
11+
github: "logic"
912

1013
markdown: kramdown
1114
highlighter: pygments
1215
paginate: 10
1316
permalink: /:year/:month/:title/
17+
18+
gems:
19+
- jekyll-feed
20+
- jekyll-sitemap

‎_includes/footer.html

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<footer class="site-footer">
2+
<ul class="links">
3+
<li><a href="/about.html">About</a></li>
4+
<li><a href="{{ site.author.uri }}">Blog</a></li>
5+
{% if site.author.github %}
6+
<li>
7+
<a href="https://github.com/{{ site.author.github }}">
8+
<span class="icon icon--github">
9+
<svg viewBox="0 0 16 16" width="16px" height="16px">
10+
<path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
11+
</svg>
12+
</span>
13+
<span class="username">{{ site.author.github }}</span>
14+
</a>
15+
</li>
16+
{% endif %}
17+
{% if site.author.twitter %}
18+
<li>
19+
<a href="https://twitter.com/{{ site.author.twitter }}">
20+
<span class="icon icon--twitter">
21+
<svg viewBox="0 0 16 16" width="16px" height="16px">
22+
<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
23+
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 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 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 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 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 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"/>
24+
</svg>
25+
</span>
26+
27+
<span class="username">{{ site.author.twitter }}</span>
28+
</a>
29+
</li>
30+
{% endif %}
31+
<li><a href="http://www.flickr.com/photos/edward_marshall">Flickr</a></li>
32+
<li><a href="/feed.xml" rel="alternate" type="application/atom+xml">Feed</a></li>
33+
</ul>
34+
</footer>

‎_includes/head.html

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<head>
2+
<meta charset="utf-8" />
3+
<meta name="viewport" content="width=device-width initial-scale=1" />
4+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
5+
6+
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
7+
{% if site.description %}<meta name="description" content="{{ site.description }}" />{% endif %}
8+
9+
<link rel="stylesheet" href="{{ "/css/default.css" | prepend: site.baseurl }}" />
10+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}" />
11+
{% feed_meta %}
12+
13+
<script type="text/javascript">
14+
var _gaq = _gaq || [];
15+
_gaq.push(['_setAccount', 'UA-818298-7']);
16+
_gaq.push(['_trackPageview']);
17+
18+
(function() {
19+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
20+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
21+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
22+
})();
23+
</script>
24+
</head>

‎_includes/header.html

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<header class="site-header">
2+
<a href="{{ site.baseurl }}/">#</a> {{ site.title }}
3+
</header>

‎_layouts/default.html

+11-31
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,18 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<title>{{ page.title }}</title>
5-
<link rel="stylesheet" type="text/css" href="/css/default.css" media="screen" />
6-
<link rel="alternate" type="application/atom+xml" title="Atom" href="/feeds/atom.xml" />
7-
<link rel="alternate" type="application/rss+xml" title="RSS" href="/feeds/rss.xml" />
8-
<script type="text/javascript">
93

10-
var _gaq = _gaq || [];
11-
_gaq.push(['_setAccount', 'UA-818298-7']);
12-
_gaq.push(['_trackPageview']);
4+
{% include head.html %}
135

14-
(function() {
15-
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
16-
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
17-
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
18-
})();
6+
<body>
7+
8+
{% include header.html %}
9+
10+
<div class="page-content">
11+
{{ content }}
12+
</div>
13+
14+
{% include footer.html %}
1915

20-
</script>
21-
</head>
22-
<body>
23-
<h1 class="header">
24-
<a href="/">#</a>
25-
Beware of programmers carrying screwdrivers
26-
</h1>
27-
<div class="content">{{ content }}</div>
28-
<div class="footer">
29-
<ul class="links">
30-
<li><a href="/about.html">About me</a></li>
31-
<li><a href="http://esm.logic.net/">My real blog</a></li>
32-
<li><a href="http://www.flickr.com/photos/edward_marshall">Flickr</a></li>
33-
<li><a href="http://github.com/logic">Github</a></li>
34-
<li><a href="/feeds/atom.xml" rel="alternate" type="application/atom+xml">Atom</a>/<a href="/feeds/rss.xml" rel="alternate" type="application/rss+xml">RSS</a></li>
35-
</ul>
36-
</div>
3716
</body>
17+
3818
</html>

‎css/default.css

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ BODY {
1212
padding: 0;
1313
}
1414

15-
.header {
15+
.site-header {
1616
padding: 5px;
1717
margin: 0px 0px 20px 0px;
1818
}
1919

20-
.header {
20+
.site-header {
2121
border-bottom: 1px dashed;
2222
font: 32px 'Cabin',sans-serif;
2323
margin-bottom: 1.5em;
@@ -33,26 +33,26 @@ A:hover {
3333
background-color: #006400;
3434
}
3535

36-
.content {
36+
.page-content {
3737
width: 80%;
3838
margin: 0 auto;
3939
}
4040

41-
.content :first-child { margin-top: 0; }
41+
.page-content :first-child { margin-top: 0; }
4242

43-
.content .date {
43+
.page-content .date {
4444
border-bottom: 1px solid #CCC;
4545
text-align: center;
4646
/*width: 5em;*/
4747
float: left;
4848
color: #787;
4949
}
5050

51-
.content .date .weekDay { font-size: 1.9em; }
52-
.content .date .monthDay { font-size: 1em; }
53-
.content .date .year { font-size: 1.4em; }
51+
.page-content .date .weekDay { font-size: 1.9em; }
52+
.page-content .date .monthDay { font-size: 1em; }
53+
.page-content .date .year { font-size: 1.4em; }
5454

55-
.content .text {
55+
.page-content .text {
5656
margin-left: 5em;
5757
}
5858

@@ -76,7 +76,7 @@ A:hover {
7676
border-top: 10px solid #CCC;
7777
}
7878

79-
.footer {
79+
.site-footer {
8080
border-top: 1px dashed;
8181
padding: 5px;
8282
margin: 20px 0px 0px 0px;

‎feeds/atom.xml

-24
This file was deleted.

‎feeds/rss.xml

-26
This file was deleted.

0 commit comments

Comments
 (0)