diff --git a/.gitignore b/.gitignore index c5e16a030..350401e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ _output _site -_/site diff --git a/Gemfile.lock b/Gemfile.lock index 17f133c2d..5b748b616 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,124 +2,123 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - activesupport (4.2.2) + activesupport (4.2.5.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - blankslate (2.1.2.4) - celluloid (0.16.0) - timers (~> 4.0.0) - classifier-reborn (2.0.3) - fast-stemmer (~> 1.0) + addressable (2.3.8) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) + coffee-script-source (1.10.0) colorator (0.1) - execjs (2.5.2) - fast-stemmer (1.0.2) - ffi (1.9.8) + ethon (0.8.1) + ffi (>= 1.3.0) + execjs (2.6.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + ffi (1.9.10) gemoji (2.1.0) - github-pages (38) + github-pages (51) RedCloth (= 4.2.9) - github-pages-health-check (~> 0.2) - jekyll (= 2.4.0) + github-pages-health-check (= 1.0.1) + jekyll (= 3.0.3) jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.3.0) - jekyll-mentions (= 0.2.1) - jekyll-redirect-from (= 0.8.0) - jekyll-sass-converter (= 1.2.0) - jekyll-sitemap (= 0.8.1) - jemoji (= 0.4.0) - kramdown (= 1.5.0) - liquid (= 2.6.2) - maruku (= 0.7.0) + jekyll-feed (= 0.4.0) + jekyll-gist (= 1.4.0) + jekyll-mentions (= 1.0.1) + jekyll-paginate (= 1.1.0) + jekyll-redirect-from (= 0.9.1) + jekyll-sass-converter (= 1.3.0) + jekyll-seo-tag (= 1.2.0) + jekyll-sitemap (= 0.10.0) + jekyll-textile-converter (= 0.1.0) + jemoji (= 0.5.1) + kramdown (= 1.9.0) + liquid (= 3.0.6) mercenary (~> 0.3) - pygments.rb (= 0.6.3) - rdiscount (= 2.1.7) - redcarpet (= 3.3.1) + rdiscount (= 2.1.8) + redcarpet (= 3.3.3) + rouge (= 1.10.1) terminal-table (~> 1.4) - github-pages-health-check (0.3.1) - net-dns (~> 0.6) + github-pages-health-check (1.0.1) + addressable (~> 2.3) + net-dns (~> 0.8) + octokit (~> 4.0) public_suffix (~> 1.4) - hitimes (1.2.2) - html-pipeline (1.9.0) - activesupport (>= 2) - nokogiri (~> 1.4) + typhoeus (~> 0.7) + html-pipeline (2.3.0) + activesupport (>= 2, < 5) + nokogiri (>= 1.4) i18n (0.7.0) - jekyll (2.4.0) - classifier-reborn (~> 2.0) + jekyll (3.0.3) 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.6.1) + liquid (~> 3.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.1.0) jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) - jekyll-feed (0.3.0) - jekyll-gist (1.2.1) - jekyll-mentions (0.2.1) - html-pipeline (~> 1.9.0) - jekyll (~> 2.0) + jekyll-feed (0.4.0) + jekyll-gist (1.4.0) + octokit (~> 4.2) + jekyll-mentions (1.0.1) + html-pipeline (~> 2.3) + jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.8.0) + jekyll-redirect-from (0.9.1) jekyll (>= 2.0) - jekyll-sass-converter (1.2.0) + jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-sitemap (0.8.1) - jekyll-watch (1.2.1) - listen (~> 2.7) - jemoji (0.4.0) + jekyll-seo-tag (1.2.0) + jekyll (>= 2.0) + jekyll-sitemap (0.10.0) + jekyll-textile-converter (0.1.0) + RedCloth (~> 4.0) + jekyll-watch (1.3.1) + listen (~> 3.0) + jemoji (0.5.1) gemoji (~> 2.0) - html-pipeline (~> 1.9) - jekyll (~> 2.0) + html-pipeline (~> 2.2) + jekyll (>= 2.0) json (1.8.3) - kramdown (1.5.0) - liquid (2.6.2) - listen (2.10.1) - celluloid (~> 0.16.0) + kramdown (1.9.0) + liquid (3.0.6) + listen (3.0.6) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - maruku (0.7.0) + rb-inotify (>= 0.9.7) mercenary (0.3.5) - mini_portile (0.6.2) - minitest (5.7.0) + mini_portile2 (2.0.0) + minitest (5.8.4) + multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.11) - public_suffix (1.5.1) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) - rb-fsevent (0.9.5) - rb-inotify (0.9.5) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + octokit (4.2.0) + sawyer (~> 0.6.0, >= 0.5.3) + public_suffix (1.5.3) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) - rdiscount (2.1.7) - redcarpet (3.3.1) + rdiscount (2.1.8) + redcarpet (3.3.3) + rouge (1.10.1) safe_yaml (1.0.4) - sass (3.4.14) - terminal-table (1.4.5) + sass (3.4.21) + sawyer (0.6.0) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) + terminal-table (1.5.2) thread_safe (0.3.5) - timers (4.0.1) - hitimes - toml (0.1.2) - parslet (~> 1.5.0) + typhoeus (0.8.0) + ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - yajl-ruby (1.2.1) PLATFORMS ruby @@ -128,4 +127,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 1.10.4 + 1.11.2 diff --git a/_config.yml b/_config.yml index 9c3b4f0c4..76ba42068 100644 --- a/_config.yml +++ b/_config.yml @@ -1,9 +1,4 @@ # files -layouts: ./_/layouts -destination: ./_/site -sass: - sass_dir: ./_/sass - exclude: - Makefile - README.md diff --git a/_/layouts/default.html b/_layouts/default.html similarity index 100% rename from _/layouts/default.html rename to _layouts/default.html diff --git a/_/layouts/home.html b/_layouts/home.html similarity index 100% rename from _/layouts/home.html rename to _layouts/home.html diff --git a/_/sass/.gitignore b/_sass/.gitignore similarity index 100% rename from _/sass/.gitignore rename to _sass/.gitignore