From 390fa865aa34402b719fbc9ca11471500522fb3c Mon Sep 17 00:00:00 2001 From: Matt Swanson Date: Thu, 31 Jul 2014 14:40:55 -0400 Subject: [PATCH] Upgrade to Jekyll 2.2.0; move theme config to _data folder, closes #5 --- .ruby-version | 1 + Gemfile | 3 + Gemfile.lock | 115 ++++++++++++++++++++++++++++ README.md | 7 +- _config.yml | 26 +------ _data/theme.yml | 21 +++++ _includes/analytics.html | 4 +- _includes/css/screen.css | 12 +-- _includes/footer.html | 4 +- _includes/sidebar.html | 2 +- _includes/social.html | 12 +-- _layouts/default.html | 8 +- _posts/2013-08-12-another-sample.md | 2 + _posts/2013-08-20-sample-post.md | 2 + atom.xml | 7 +- 15 files changed, 174 insertions(+), 52 deletions(-) create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 _data/theme.yml diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..e1b9401f5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.0.0-p195 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..c4b4bf96a --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "github-pages" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..f27ba512a --- /dev/null +++ b/Gemfile.lock @@ -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 diff --git a/README.md b/README.md index eb1ff2eab..0b837bd82 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ 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 . @@ -28,7 +28,7 @@ You should have a server up and running locally at . ## 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 diff --git a/_config.yml b/_config.yml index 75e8d1c28..42b7a90f0 100644 --- a/_config.yml +++ b/_config.yml @@ -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] diff --git a/_data/theme.yml b/_data/theme.yml new file mode 100644 index 000000000..20c9c7a3c --- /dev/null +++ b/_data/theme.yml @@ -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 \ No newline at end of file diff --git a/_includes/analytics.html b/_includes/analytics.html index 2f4025e6a..cf276d0e2 100644 --- a/_includes/analytics.html +++ b/_includes/analytics.html @@ -1,8 +1,8 @@ -{% if site.theme.google_analytics_key %} +{% if site.data.theme.google_analytics_key %}