Skip to content

Commit 3950383

Browse files
committed
updated to use Jekyll
1 parent 82135ac commit 3950383

21 files changed

+766
-11
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
_site
2+
.sass-cache
3+
.jekyll-metadata

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# danmac.github.io
2-
user site
1+
My personal site.

_config.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Welcome to Jekyll!
2+
#
3+
# This config file is meant for settings that affect your whole blog, values
4+
# which you are expected to set up once and rarely need to edit after that.
5+
# For technical reasons, this file is *NOT* reloaded automatically when you use
6+
# 'jekyll serve'. If you change this file, please restart the server process.
7+
8+
# Site settings
9+
title: Dan MacLeod
10+
email: dan@danmac.me
11+
description: > # this means to ignore newlines until "baseurl:"
12+
Adelaide based Web Developer
13+
baseurl: "" # the subpath of your site, e.g. /blog
14+
url: "http://danmac.me" # the base hostname & protocol for your site
15+
twitter_username: danmac
16+
github_username: danmac
17+
18+
# Build settings
19+
markdown: kramdown

_includes/footer.html

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<footer class="site-footer">
2+
3+
<div class="wrapper">
4+
5+
<h2 class="footer-heading">{{ site.title }}</h2>
6+
7+
<div class="footer-col-wrapper">
8+
<div class="footer-col footer-col-1">
9+
<ul class="contact-list">
10+
<li>{{ site.title }}</li>
11+
<li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
12+
</ul>
13+
</div>
14+
15+
<div class="footer-col footer-col-2">
16+
<ul class="social-media-list">
17+
{% if site.github_username %}
18+
<li>
19+
{% include icon-github.html username=site.github_username %}
20+
</li>
21+
{% endif %}
22+
23+
{% if site.twitter_username %}
24+
<li>
25+
{% include icon-twitter.html username=site.twitter_username %}
26+
</li>
27+
{% endif %}
28+
</ul>
29+
</div>
30+
31+
<div class="footer-col footer-col-3">
32+
<p>{{ site.description }}</p>
33+
</div>
34+
</div>
35+
36+
</div>
37+
38+
</footer>

_includes/head.html

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<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+
6+
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
7+
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
8+
9+
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
10+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
11+
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
12+
</head>

_includes/header.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<header class="site-header">
2+
3+
<div class="wrapper">
4+
5+
<a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
6+
7+
<nav class="site-nav">
8+
<a href="#" class="menu-icon">
9+
<svg viewBox="0 0 18 15">
10+
<path fill="#424242" 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.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
11+
<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
12+
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
13+
</svg>
14+
</a>
15+
16+
<div class="trigger">
17+
{% for my_page in site.pages %}
18+
{% if my_page.title %}
19+
<a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
20+
{% endif %}
21+
{% endfor %}
22+
</div>
23+
</nav>
24+
25+
</div>
26+
27+
</header>

_includes/icon-github.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +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>

_includes/icon-github.svg

+1
Loading

_includes/icon-twitter.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +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>

_includes/icon-twitter.svg

+1
Loading

_layouts/default.html

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
{% include head.html %}
5+
6+
<body>
7+
8+
{% include header.html %}
9+
10+
<div class="page-content">
11+
<div class="wrapper">
12+
{{ content }}
13+
</div>
14+
</div>
15+
16+
{% include footer.html %}
17+
18+
</body>
19+
20+
</html>

_layouts/page.html

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
layout: default
3+
---
4+
<article class="post">
5+
6+
<header class="post-header">
7+
<h1 class="post-title">{{ page.title }}</h1>
8+
</header>
9+
10+
<div class="post-content">
11+
{{ content }}
12+
</div>
13+
14+
</article>

_layouts/post.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
layout: default
3+
---
4+
<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
5+
6+
<header class="post-header">
7+
<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 %}</p>
9+
</header>
10+
11+
<div class="post-content" itemprop="articleBody">
12+
{{ content }}
13+
</div>
14+
15+
</article>

_sass/_base.scss

+206
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
/**
2+
* Reset some basic elements
3+
*/
4+
body, h1, h2, h3, h4, h5, h6,
5+
p, blockquote, pre, hr,
6+
dl, dd, ol, ul, figure {
7+
margin: 0;
8+
padding: 0;
9+
}
10+
11+
12+
13+
/**
14+
* Basic styling
15+
*/
16+
body {
17+
font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
18+
color: $text-color;
19+
background-color: $background-color;
20+
-webkit-text-size-adjust: 100%;
21+
-webkit-font-feature-settings: "kern" 1;
22+
-moz-font-feature-settings: "kern" 1;
23+
-o-font-feature-settings: "kern" 1;
24+
font-feature-settings: "kern" 1;
25+
font-kerning: normal;
26+
}
27+
28+
29+
30+
/**
31+
* Set `margin-bottom` to maintain vertical rhythm
32+
*/
33+
h1, h2, h3, h4, h5, h6,
34+
p, blockquote, pre,
35+
ul, ol, dl, figure,
36+
%vertical-rhythm {
37+
margin-bottom: $spacing-unit / 2;
38+
}
39+
40+
41+
42+
/**
43+
* Images
44+
*/
45+
img {
46+
max-width: 100%;
47+
vertical-align: middle;
48+
}
49+
50+
51+
52+
/**
53+
* Figures
54+
*/
55+
figure > img {
56+
display: block;
57+
}
58+
59+
figcaption {
60+
font-size: $small-font-size;
61+
}
62+
63+
64+
65+
/**
66+
* Lists
67+
*/
68+
ul, ol {
69+
margin-left: $spacing-unit;
70+
}
71+
72+
li {
73+
> ul,
74+
> ol {
75+
margin-bottom: 0;
76+
}
77+
}
78+
79+
80+
81+
/**
82+
* Headings
83+
*/
84+
h1, h2, h3, h4, h5, h6 {
85+
font-weight: $base-font-weight;
86+
}
87+
88+
89+
90+
/**
91+
* Links
92+
*/
93+
a {
94+
color: $brand-color;
95+
text-decoration: none;
96+
97+
&:visited {
98+
color: darken($brand-color, 15%);
99+
}
100+
101+
&:hover {
102+
color: $text-color;
103+
text-decoration: underline;
104+
}
105+
}
106+
107+
108+
109+
/**
110+
* Blockquotes
111+
*/
112+
blockquote {
113+
color: $grey-color;
114+
border-left: 4px solid $grey-color-light;
115+
padding-left: $spacing-unit / 2;
116+
font-size: 18px;
117+
letter-spacing: -1px;
118+
font-style: italic;
119+
120+
> :last-child {
121+
margin-bottom: 0;
122+
}
123+
}
124+
125+
126+
127+
/**
128+
* Code formatting
129+
*/
130+
pre,
131+
code {
132+
font-size: 15px;
133+
border: 1px solid $grey-color-light;
134+
border-radius: 3px;
135+
background-color: #eef;
136+
}
137+
138+
code {
139+
padding: 1px 5px;
140+
}
141+
142+
pre {
143+
padding: 8px 12px;
144+
overflow-x: auto;
145+
146+
> code {
147+
border: 0;
148+
padding-right: 0;
149+
padding-left: 0;
150+
}
151+
}
152+
153+
154+
155+
/**
156+
* Wrapper
157+
*/
158+
.wrapper {
159+
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
160+
max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
161+
margin-right: auto;
162+
margin-left: auto;
163+
padding-right: $spacing-unit;
164+
padding-left: $spacing-unit;
165+
@extend %clearfix;
166+
167+
@include media-query($on-laptop) {
168+
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
169+
max-width: calc(#{$content-width} - (#{$spacing-unit}));
170+
padding-right: $spacing-unit / 2;
171+
padding-left: $spacing-unit / 2;
172+
}
173+
}
174+
175+
176+
177+
/**
178+
* Clearfix
179+
*/
180+
%clearfix {
181+
182+
&:after {
183+
content: "";
184+
display: table;
185+
clear: both;
186+
}
187+
}
188+
189+
190+
191+
/**
192+
* Icons
193+
*/
194+
.icon {
195+
196+
> svg {
197+
display: inline-block;
198+
width: 16px;
199+
height: 16px;
200+
vertical-align: middle;
201+
202+
path {
203+
fill: $grey-color;
204+
}
205+
}
206+
}

0 commit comments

Comments
 (0)