Permalink
Browse files

Upgrade to Jekyll 2.2.0; move theme config to _data folder, closes #5

  • Loading branch information...
swanson committed Jul 31, 2014
1 parent c985b6e commit 390fa865aa34402b719fbc9ca11471500522fb3c
View
@@ -0,0 +1 @@
2.0.0-p195
View
@@ -0,0 +1,3 @@
source "https://rubygems.org"
gem "github-pages"
View
@@ -0,0 +1,115 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.1.4)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
blankslate (2.1.2.4)
celluloid (0.15.2)
timers (~> 1.1.0)
classifier (1.3.4)
fast-stemmer (>= 1.0.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
colorator (0.1)
execjs (2.2.1)
fast-stemmer (1.0.2)
ffi (1.9.3)
gemoji (2.0.0)
github-pages (21)
RedCloth (= 4.2.9)
jekyll (= 2.2.0)
jekyll-coffeescript (= 1.0.0)
jekyll-mentions (= 0.1.3)
jekyll-redirect-from (= 0.4.0)
jekyll-sass-converter (= 1.1.0)
jekyll-sitemap (= 0.5.0)
jemoji (= 0.3.0)
kramdown (= 1.3.1)
liquid (= 2.6.1)
maruku (= 0.7.0)
pygments.rb (= 0.6.0)
rdiscount (= 2.1.7)
redcarpet (= 3.1.2)
html-pipeline (1.9.0)
activesupport (>= 2)
nokogiri (~> 1.4)
i18n (0.6.11)
jekyll (2.2.0)
classifier (~> 1.3)
colorator (~> 0.1)
jekyll-coffeescript (~> 1.0)
jekyll-gist (~> 1.0)
jekyll-paginate (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.0)
kramdown (~> 1.3)
liquid (~> 2.6.1)
mercenary (~> 0.3.3)
pygments.rb (~> 0.6.0)
redcarpet (~> 3.1)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
jekyll-coffeescript (1.0.0)
coffee-script (~> 2.2)
jekyll-gist (1.1.0)
jekyll-mentions (0.1.3)
html-pipeline (~> 1.9.0)
jekyll (~> 2.0)
jekyll-paginate (1.0.0)
jekyll-redirect-from (0.4.0)
jekyll (~> 2.0)
jekyll-sass-converter (1.1.0)
sass (~> 3.2)
jekyll-sitemap (0.5.0)
jekyll-watch (1.0.0)
listen (~> 2.7)
jemoji (0.3.0)
gemoji (~> 2.0)
html-pipeline (~> 1.9)
jekyll (~> 2.0)
json (1.8.1)
kramdown (1.3.1)
liquid (2.6.1)
listen (2.7.9)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
maruku (0.7.0)
mercenary (0.3.4)
mini_portile (0.6.0)
minitest (5.4.0)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.8)
pygments.rb (0.6.0)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdiscount (2.1.7)
redcarpet (3.1.2)
safe_yaml (1.0.3)
sass (3.3.12)
thread_safe (0.3.4)
timers (1.1.0)
toml (0.1.1)
parslet (~> 1.5.0)
tzinfo (1.2.1)
thread_safe (~> 0.1)
yajl-ruby (1.1.0)
PLATFORMS
ruby
DEPENDENCIES
github-pages
View
@@ -18,17 +18,17 @@ Extracted lovingly from [http://mdswanson.com][mds] for your enjoyment!
## Installation
- Install Jekyll: `gem install jekyll`
- [Fork this repository][fork]
- Clone it: `git clone https://github.com/YOUR-USER/lagom`
- Install the [GitHub Pages gem][pages] (includes Jekyll): `bundle install`
- Run the jekyll server: `jekyll serve`
You should have a server up and running locally at <http://localhost:4000>.
## Customization
Next you'll want to change a few things. Most of them can be changed directly in
[_config.yml][config]. That's where you can add your social links, change the accent
[theme.yml][config]. That's where you can add your social links, change the accent
color, stuff like that.
There's a few other places that you'll want to change, too:
@@ -64,9 +64,10 @@ run into trouble or have suggestions. Pull Requests always welcome.
[font-awesome]: http://fortawesome.github.io/Font-Awesome/
[gfonts]: http://www.google.com/fonts/specimen/Open+Sans
[fork]: https://github.com/swanson/lagom/fork
[config]: https://github.com/swanson/lagom/blob/master/_config.yml
[config]: https://github.com/swanson/lagom/blob/master/_data/theme.yml
[cname]: https://github.com/swanson/lagom/blob/master/CNAME
[favicon]: https://github.com/swanson/lagom/blob/master/favicon.png
[logo]: https://github.com/swanson/lagom/blob/master/logo.png
[pages]: http://pages.github.com
[twitter]: https://twitter.com/_swanson
[pages]: https://github.com/github/pages-gem
View
@@ -1,27 +1,5 @@
# General Jekyll Config
pygments: true
highlighter: pygments
url: http://example.com
lsi: false
exclude: [LICENSE, CNAME, README.md, .gitignore]
# Theme customization - please change from the defaults!
theme:
# Color for top bar, links, etc
highlight_color: '#3498db'
# Profile links on the left sidebar, leave blank to ignore
social:
github: swanson
twitter: _swanson
hacker_news: swanson
# "Hi, I'm _______"
name: Matt Swanson
email: test@example.com
tagline: "weak opinions, strongly held"
# Google Analytics key, leave blank to ignore
google_analytics_key: UA-xxxx-x
# Toggle "Postings are my own" disclaimer in footer
show_disclaimer: true
exclude: [LICENSE, CNAME, README.md, .gitignore, Gemfile, Gemfile.lock]
View
@@ -0,0 +1,21 @@
# Theme customization - please change from the defaults!
# Color for top bar, links, etc
highlight_color: '#3498db'
# Profile links on the left sidebar, leave blank to ignore
social:
github: swanson
twitter: _swanson
hacker_news: swanson
# "Hi, I'm _______"
name: Matt Swanson
email: test@example.com
tagline: "weak opinions, strongly held"
# Google Analytics key, leave blank to ignore
google_analytics_key: UA-xxxx-x
# Toggle "Postings are my own" disclaimer in footer
show_disclaimer: true
View
@@ -1,8 +1,8 @@
{% if site.theme.google_analytics_key %}
{% if site.data.theme.google_analytics_key %}
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ site.theme.google_analytics_key }}']);
_gaq.push(['_setAccount', '{{ site.data.theme.google_analytics_key }}']);
_gaq.push(['_trackPageview']);
(function() {
View
@@ -13,7 +13,7 @@ body {
color: #222222;
line-height: 24px;
margin: 0;
border-top: 7px solid {{ site.theme.highlight_color }};
border-top: 7px solid {{ site.data.theme.highlight_color }};
}
h1, h2, h3, h4, h5, h6 {
@@ -48,17 +48,17 @@ ul {
}
a {
color: {{ site.theme.highlight_color }};
color: {{ site.data.theme.highlight_color }};
text-decoration: none;
}
a:hover {
color: {{ site.theme.highlight_color }};
color: {{ site.data.theme.highlight_color }};
text-decoration: underline;
}
a:visited {
color: {{ site.theme.highlight_color }};
color: {{ site.data.theme.highlight_color }};
}
table {
@@ -180,7 +180,7 @@ nav hr {
}
#home h2 {
color: {{ site.theme.highlight_color }};
color: {{ site.data.theme.highlight_color }};
}
#logo {
@@ -206,7 +206,7 @@ nav hr {
#stalker a:hover {
text-decoration: none;
color: {{ site.theme.highlight_color }};
color: {{ site.data.theme.highlight_color }};
}
span.icon-hn {
View
@@ -1,12 +1,12 @@
<div class="disclaimer">
{% if site.theme.show_disclaimer %}
{% if site.data.theme.show_disclaimer %}
<p>
The postings on this site are my own and don't necessarily represent my
employer’s positions, strategies or opinions.
</p>
{% endif %}
<p>
© {{ site.theme.name }}, 2013 &mdash; built with Jekyll using Lagom theme
© {{ site.data.theme.name }}, 2014 &mdash; built with <a href="http://jekyllrb.com/">Jekyll</a> using <a href="https://github.com/swanson/lagom">Lagom theme</a>
</p>
</div>
View
@@ -3,7 +3,7 @@ <h1>Hi.</h1>
<a href="/">
<img src="/logo.png" id="logo" alt="Blog logo"/>
</a>
<h2>I'm <a href="/">{{ site.theme.name }}</a>.</h2>
<h2>I'm <a href="/">{{ site.data.theme.name }}</a>.</h2>
<hr/>
<ul>
<p>A brief bio or something witty.</p>
View
@@ -1,20 +1,20 @@
Follow me:
<div id="stalker">
{% if site.theme.social.github %}
<a title="{{ site.theme.social.github }} on Github" href="http://github.com/{{ site.theme.social.github }}">
{% if site.data.theme.social.github %}
<a title="{{ site.data.theme.social.github }} on Github" href="http://github.com/{{ site.data.theme.social.github }}">
<i class="icon-github-sign"></i>
</a>
{% endif %}
{% if site.theme.social.hacker_news %}
<a title="{{ site.theme.social.hacker_news }} on Hacker News" href="http://news.ycombinator.com/user?id={{site.theme.social.hacker_news }}">
{% if site.data.theme.social.hacker_news %}
<a title="{{ site.data.theme.social.hacker_news }} on Hacker News" href="http://news.ycombinator.com/user?id={{site.data.theme.social.hacker_news }}">
<i class="icon-sign-blank"></i>
<span class="icon-overlay icon-hn">Y</span>
</a>
{% endif %}
{% if site.theme.social.twitter %}
<a title="{{ site.theme.social.twitter }} on Twitter" href="http://twitter.com/{{ site.theme.social.twitter }}">
{% if site.data.theme.social.twitter %}
<a title="{{ site.data.theme.social.twitter }} on Twitter" href="http://twitter.com/{{ site.data.theme.social.twitter }}">
<i class="icon-twitter-sign"></i>
</a>
{% endif %}
View
@@ -6,14 +6,14 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ site.theme.name }} - {{ page.title }}</title>
<meta name="author" content="{{ site.theme.name }}" />
<meta name="description" content="The blog of {{ site.theme.name }}" />
<title>{{ site.data.theme.name }} - {{ page.title }}</title>
<meta name="author" content="{{ site.data.theme.name }}" />
<meta name="description" content="The blog of {{ site.data.theme.name }}" />
<link rel="canonical" href="{{ site.url }}{{ page.url | replace:'index.html','' }}" />
<link href="//fonts.googleapis.com/css?family=Open+Sans:600,800" rel="stylesheet" type="text/css">
<link rel="shortcut icon" href="/favicon.png">
<link rel="alternate" type="application/rss+xml" title="{{ site.theme.name }}" href="{{site.url}}/atom.xml" />
<link rel="alternate" type="application/rss+xml" title="{{ site.data.theme.name }}" href="{{site.url}}/atom.xml" />
<link rel="stylesheet" href="/assets/css/all.css">
<!--[if IE 7]>
@@ -16,7 +16,9 @@ chia, **wayfarers** swag raw denim hashtag biodiesel occupy gastropub!
---
# It's all in the game.
## You come at the king, you best not miss.
### Be subtle with it, man. You know what subtle means?
VHS post-ironic cred **bespoke** banjo. Yr wayfarers literally gentrify, flexitarian fap
@@ -16,7 +16,9 @@ chia, **wayfarers** swag raw denim hashtag biodiesel occupy gastropub!
---
# It's all in the game.
## You come at the king, you best not miss.
### Be subtle with it, man. You know what subtle means?
VHS post-ironic cred **bespoke** banjo. Yr wayfarers literally gentrify, flexitarian fap
View
@@ -1,17 +1,16 @@
---
layout: nil
---
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title>The blog of {{ site.theme.name }}</title>
<title>The blog of {{ site.data..theme.name }}</title>
<link href="{{ site.url }}/atom.xml" rel="self"/>
<link href="{{ site.url }}"/>
<updated>{{ site.time | date_to_xmlschema }}</updated>
<id>{{ site.url }}</id>
<author>
<name>{{ site.theme.name }}</name>
<email>{{ site.theme.email }}</email>
<name>{{ site.data.theme.name }}</name>
<email>{{ site.data.theme.email }}</email>
</author>
{% for post in site.posts %}

0 comments on commit 390fa86

Please sign in to comment.