From 2cc2d85875ada40522fa1e4ebc950880bff75858 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Wed, 13 Aug 2014 21:11:56 +0200 Subject: [PATCH] Updates --- Gemfile | 10 +- Gemfile.lock | 69 ++++++++----- _assets/stylesheets/gist.less | 186 ++++++++++++++++++++++++++++++++++ _assets/stylesheets/main.less | 4 +- feed.xml | 2 +- robots.txt | 2 +- sitemap.xml | 6 +- 7 files changed, 240 insertions(+), 39 deletions(-) create mode 100644 _assets/stylesheets/gist.less diff --git a/Gemfile b/Gemfile index 9cf2d7e..5667a28 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,12 @@ source 'https://rubygems.org' ruby '2.1.2' -gem 'jekyll', '~> 2.0.3' -gem 'jekyll-assets', '~> 0.7.9' +gem 'jekyll', '~> 2.3.0' +gem 'jekyll-assets', '~> 0.9.2' -gem 'kramdown', '~> 1.3.3' +gem 'kramdown', '~> 1.4.1' gem 'therubyracer', '~> 0.12.1' -gem 'less', '~> 2.5.0' +gem 'less', '~> 2.6.0' -gem 'uglifier', '~> 2.5.0' +gem 'uglifier', '~> 2.5.3' gem 'yui-compressor', '~> 0.12.0' diff --git a/Gemfile.lock b/Gemfile.lock index e5243c6..71ae7f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,70 +4,83 @@ GEM 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.2.0) + classifier-reborn (2.0.0) + fast-stemmer (~> 1.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.7.1) colorator (0.1) commonjs (0.2.7) - execjs (2.0.2) + execjs (2.2.1) fast-stemmer (1.0.2) ffi (1.9.3) hike (1.2.3) - jekyll (2.0.3) - classifier (~> 1.3) + jekyll (2.3.0) + classifier-reborn (~> 2.0) colorator (~> 0.1) jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 2.5.5) - listen (~> 2.5) + liquid (~> 2.6.1) mercenary (~> 0.3.3) - pygments.rb (~> 0.5.0) + pygments.rb (~> 0.6.0) redcarpet (~> 3.1) safe_yaml (~> 1.0) toml (~> 0.1.0) - jekyll-assets (0.7.9) + jekyll-assets (0.9.2) jekyll (>= 1.0.0, < 3.0.0) - sass + sass (~> 3.2) sprockets (~> 2.10) + sprockets-helpers + sprockets-sass jekyll-coffeescript (1.0.0) coffee-script (~> 2.2) - jekyll-sass-converter (1.0.0) + jekyll-gist (1.1.0) + jekyll-paginate (1.0.0) + jekyll-sass-converter (1.2.0) sass (~> 3.2) + jekyll-watch (1.1.0) + listen (~> 2.7) json (1.8.1) - kramdown (1.3.3) - less (2.5.0) + kramdown (1.4.1) + less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.3) - liquid (2.5.5) - listen (2.7.5) + liquid (2.6.1) + listen (2.7.9) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - mercenary (0.3.3) + mercenary (0.3.4) multi_json (1.10.1) parslet (1.5.0) blankslate (~> 2.0) - posix-spawn (0.3.8) - pygments.rb (0.5.4) + posix-spawn (0.3.9) + pygments.rb (0.6.0) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) rack (1.5.2) rb-fsevent (0.9.4) - rb-inotify (0.9.4) + rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.1.2) ref (1.0.5) safe_yaml (1.0.3) - sass (3.3.7) + sass (3.3.14) sprockets (2.12.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sprockets-helpers (1.1.0) + sprockets (~> 2.0) + sprockets-sass (1.2.0) + sprockets (~> 2.0) + tilt (~> 1.1) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref @@ -75,7 +88,7 @@ GEM timers (1.1.0) toml (0.1.1) parslet (~> 1.5.0) - uglifier (2.5.0) + uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) yajl-ruby (1.1.0) @@ -85,10 +98,10 @@ PLATFORMS ruby DEPENDENCIES - jekyll (~> 2.0.3) - jekyll-assets (~> 0.7.9) - kramdown (~> 1.3.3) - less (~> 2.5.0) + jekyll (~> 2.3.0) + jekyll-assets (~> 0.9.2) + kramdown (~> 1.4.1) + less (~> 2.6.0) therubyracer (~> 0.12.1) - uglifier (~> 2.5.0) + uglifier (~> 2.5.3) yui-compressor (~> 0.12.0) diff --git a/_assets/stylesheets/gist.less b/_assets/stylesheets/gist.less new file mode 100644 index 0000000..528fd85 --- /dev/null +++ b/_assets/stylesheets/gist.less @@ -0,0 +1,186 @@ +.gist { + + .highlight { + color:#000; + } + + .render-container .render-viewer-error, + .render-container .render-viewer-fatal, + .render-container .octospinner { + display:none; + } + + .gist-render iframe { + width:100%; + } + + .gist-file.gist-render .highlight { + border:none; + } + + .gist-file .gist-meta .highlight a { + font-weight:700; + color:#666; + text-decoration:none; + } + + .highlight { + background:#fff; + } + + .highlight .err { + color:#a61717; + background-color:#e3d2d2; + } + + .highlight .cp { + color:#999; + font-weight:700; + } + + .highlight .cs { + color:#999; + font-weight:700; + font-style:italic; + } + + .highlight .gd { + color:#000; + background-color:#fdd; + } + + .highlight .gd .x { + color:#000; + background-color:#faa; + } + + .highlight .ge { + color:#000; + font-style:italic; + } + + .highlight .gi { + color:#000; + background-color:#dfd; + } + + .highlight .gi .x { + color:#000; + background-color:#afa; + } + + .highlight .go { + color:#888; + } + + .highlight .gs { + font-weight:700; + } + + .highlight .gu { + color:#aaa; + } + + .highlight .nb { + color:#0086b3; + } + + .highlight .ni { + color:purple; + } + + .highlight .nt { + color:navy; + } + + .highlight .w { + color:#bbb; + } + + .highlight .sr { + color:#009926; + } + + .highlight .ss { + color:#990073; + } + + .highlight .c, + .highlight .cm, + .highlight .c1 { + color:#998; + font-style:italic; + } + + .highlight .k, + .highlight .o, + .highlight .kc, + .highlight .kd, + .highlight .kp, + .highlight .kr, + .highlight .ow, + .highlight .n, + .highlight .p { + color:#000; + font-weight:700; + } + + .highlight .gr, + .highlight .gt { + color:#a00; + } + + .highlight .gh, + .highlight .bp { + color:#999; + } + + .highlight .gp, + .highlight .nn { + color:#555; + } + + .highlight .kt, + .highlight .nc { + color:#458; + font-weight:700; + } + + .highlight .m, + .highlight .mf, + .highlight .mh, + .highlight .mi, + .highlight .mo, + .highlight .il { + color:#099; + } + + .highlight .s, + .highlight .sb, + .highlight .sc, + .highlight .sd, + .highlight .s2, + .highlight .se, + .highlight .sh, + .highlight .si, + .highlight .sx, + .highlight .s1 { + color:#d14; + } + + .highlight .na, + .highlight .no, + .highlight .nv, + .highlight .vc, + .highlight .vg, + .highlight .vi { + color:teal; + } + + .highlight .ne, + .highlight .nf { + color:#900; + font-weight:700; + } + +} diff --git a/_assets/stylesheets/main.less b/_assets/stylesheets/main.less index 551e14b..bbf32ee 100644 --- a/_assets/stylesheets/main.less +++ b/_assets/stylesheets/main.less @@ -18,6 +18,8 @@ @import "pygments.less"; // Coderay Syntax highlighting =============================== @import "coderay.less"; +// Gist Syntax highlighting =================================== +@import "gist.less"; // MIXINS ===================================================== @import "mixins.less"; @import "grid.less"; @@ -30,4 +32,4 @@ @import "font-awesome/font-awesome.less"; // LAYOUT ===================================================== // Page level layout styles =================================== -@import "page.less"; \ No newline at end of file +@import "page.less"; diff --git a/feed.xml b/feed.xml index 28d583d..5988999 100644 --- a/feed.xml +++ b/feed.xml @@ -1,5 +1,5 @@ --- -layout: none +layout: null --- diff --git a/robots.txt b/robots.txt index ec3f2e9..8f5cb64 100644 --- a/robots.txt +++ b/robots.txt @@ -1,5 +1,5 @@ --- -layout: nil +layout: null --- User-agent: * diff --git a/sitemap.xml b/sitemap.xml index 604cb0d..b5fab05 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1,12 +1,12 @@ --- -layout: nil +layout: null --- {{ site.url }} - + {% for page in site.pages %} {{ site.url }}{{ page.url }} @@ -18,4 +18,4 @@ layout: nil {{ site.url }}{{ post.url }} {% endfor %} - \ No newline at end of file +