From d55343c4e291d3cf0d12e29213c50f65caae3821 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sat, 30 May 2015 14:19:09 -0700 Subject: [PATCH 01/20] Use picturefill from bower. --- _assets/javascripts/app.js.coffee.erb | 2 +- _assets/javascripts/vendor/picturefill.js | 61 ----------------------- bower.json | 1 + 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 _assets/javascripts/vendor/picturefill.js diff --git a/_assets/javascripts/app.js.coffee.erb b/_assets/javascripts/app.js.coffee.erb index 8b97fc9..104aab3 100644 --- a/_assets/javascripts/app.js.coffee.erb +++ b/_assets/javascripts/app.js.coffee.erb @@ -10,7 +10,7 @@ # Require JavaScript for responsive images. <% case site.config['picture']['markup'] when 'picturefill' - require_asset 'vendor/picturefill' + require_asset 'picturefill' when 'interchange' require_asset 'foundation/js/foundation/foundation.interchange' end unless site.config['picture'].nil? diff --git a/_assets/javascripts/vendor/picturefill.js b/_assets/javascripts/vendor/picturefill.js deleted file mode 100644 index be55714..0000000 --- a/_assets/javascripts/vendor/picturefill.js +++ /dev/null @@ -1,61 +0,0 @@ -/*! Picturefill - Responsive Images that work today. (and mimic the proposed Picture element with span elements). Author: Scott Jehl, Filament Group, 2012 | License: MIT/GPLv2 */ - -(function( w ){ - - // Enable strict mode - "use strict"; - - w.picturefill = function() { - var ps = w.document.getElementsByTagName( "span" ); - - // Loop the pictures - for( var i = 0, il = ps.length; i < il; i++ ){ - if( ps[ i ].getAttribute( "data-picture" ) !== null ){ - - var sources = ps[ i ].getElementsByTagName( "span" ), - matches = []; - - // See if which sources match - for( var j = 0, jl = sources.length; j < jl; j++ ){ - var media = sources[ j ].getAttribute( "data-media" ); - // if there's no media specified, OR w.matchMedia is supported - if( !media || ( w.matchMedia && w.matchMedia( media ).matches ) ){ - matches.push( sources[ j ] ); - } - } - - // Find any existing img element in the picture element - var picImg = ps[ i ].getElementsByTagName( "img" )[ 0 ]; - - if( matches.length ){ - var matchedEl = matches.pop(); - if( !picImg || picImg.parentNode.nodeName === "NOSCRIPT" ){ - picImg = w.document.createElement( "img" ); - picImg.alt = ps[ i ].getAttribute( "data-alt" ); - } - - picImg.src = matchedEl.getAttribute( "data-src" ); - matchedEl.appendChild( picImg ); - } - else if( picImg ){ - picImg.parentNode.removeChild( picImg ); - } - } - } - }; - - // Run on resize and domready (w.load as a fallback) - if( w.addEventListener ){ - w.addEventListener( "resize", w.picturefill, false ); - w.addEventListener( "DOMContentLoaded", function(){ - w.picturefill(); - // Run once only - w.removeEventListener( "load", w.picturefill, false ); - }, false ); - w.addEventListener( "load", w.picturefill, false ); - } - else if( w.attachEvent ){ - w.attachEvent( "onload", w.picturefill ); - } - -}( this )); diff --git a/bower.json b/bower.json index 44f9f67..bbc05a7 100644 --- a/bower.json +++ b/bower.json @@ -20,6 +20,7 @@ "headjs": "1.0.3", "highlightjs": "8.5.0", "normalize-css": "3.0.3", + "picturefill": "2.3.1", "webfontloader": "1.5.18" } } From 71c72ffd13423c253c86e88d2808b813dfb240c4 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 31 May 2015 00:53:38 -0700 Subject: [PATCH 02/20] Split content from default layout into body layout. --- CHANGELOG.md | 2 ++ _layouts/body.html | 17 +++++++++++++++++ _layouts/default.html | 12 ------------ _layouts/post.html | 2 +- 4 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 _layouts/body.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f5b996..ef95bde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ - Switch to using [rake-jekyll] for git based deployment. You may now set the `SOURCE_BRANCH` environment variable to enable testing on all other branches. +- Split main body content out from the default layout + and into a new body layout. - Use gist-aysnc bower package. - Remove Sub-content feature. - Add staging environment support for Travis CI builds. diff --git a/_layouts/body.html b/_layouts/body.html new file mode 100644 index 0000000..00e460e --- /dev/null +++ b/_layouts/body.html @@ -0,0 +1,17 @@ +--- +layout: default +--- + +
+

{{ site.name }}

+
+ +{{ content }} + + diff --git a/_layouts/default.html b/_layouts/default.html index 4fab2d2..966cfa3 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -13,20 +13,8 @@ -
-

{{ site.name }}

-
- {{ content }} - - {% if site.social.facebook.enabled %}
{% endif %} diff --git a/_layouts/post.html b/_layouts/post.html index 14d9949..0c3a1b3 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,5 +1,5 @@ --- -layout: default +layout: body ---
From f0aefa3c7f6d0748b5a15780dea1f507826564ac Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 31 May 2015 00:54:28 -0700 Subject: [PATCH 03/20] Remove html5 badge. --- _assets/images/html5-badge-h-css3-semantics.png | Bin 3466 -> 0 bytes _layouts/body.html | 4 ---- 2 files changed, 4 deletions(-) delete mode 100644 _assets/images/html5-badge-h-css3-semantics.png diff --git a/_assets/images/html5-badge-h-css3-semantics.png b/_assets/images/html5-badge-h-css3-semantics.png deleted file mode 100644 index 18143fd6021f011d2aebcff4aeca83294b75889e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3466 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 site.name }} From 89123be5c6b29aec4c51d7f8d4929a2225c0b665 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 31 May 2015 00:56:56 -0700 Subject: [PATCH 04/20] Minor comment edit to app.css. --- _assets/stylesheets/app.css.sass.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/_assets/stylesheets/app.css.sass.erb b/_assets/stylesheets/app.css.sass.erb index 6d5c3b4..d2bcb6e 100644 --- a/_assets/stylesheets/app.css.sass.erb +++ b/_assets/stylesheets/app.css.sass.erb @@ -4,9 +4,7 @@ // Make sure the charset is set appropriately. @charset "UTF-8" -// // Fonts -// @import fonts // Global Foundation Settings From 94b6bb8929a3fc943bcf38b303ea7a7874767ace Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 31 May 2015 00:58:19 -0700 Subject: [PATCH 05/20] Index page should use body layout. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 7f8d54d..46ee142 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ --- -layout: default +layout: body title: Page Title --- From 74d5dc6dc64af5e05d609f6f60ac1bb95571f439 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Fri, 5 Jun 2015 11:59:57 -0700 Subject: [PATCH 06/20] Move staging config generation to separate method. --- Rakefile | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/Rakefile b/Rakefile index fb45bc5..8a7373d 100644 --- a/Rakefile +++ b/Rakefile @@ -22,19 +22,29 @@ def spawn *cmd switch = true Signal.trap 'SIGINT' do - Process.kill( :QUIT, pid ) && Process.wait + Process.kill(:QUIT, pid) && Process.wait switch = false end while switch do sleep 1 end end +# Generate a staging config if staging URL is set. +def generate_staging_config(url, config) + staging = {'domain' => url, 'baseurl' => url, + 'assets' => {'baseurl' => "#{url}/assets"}} + File.open(config, 'w') { |f| f.write staging.to_yaml } +end + # Command to build static site to destination (as an Array). -def build_site_command(destination=nil) +def build_site_command(destination=nil, staging_url='') + config = '_config.staging.yml' + generate_staging_config(staging_url, config) unless staging_url.empty? + args = [] args.concat ['--destination', destination] unless destination.nil? - if File.exists? '_config.staging.yml' - args.concat ['--config', '_config.yml,_config.staging.yml'] + if File.exists? config + args.concat ['--config', "_config.yml,#{config}"] end ['bundle', 'exec', 'jekyll', 'build', *args] @@ -43,7 +53,11 @@ end # rake build desc 'Generate the site' task :build do - sh(*build_site_command) + staging_url = ENV['STAGING_URL'].to_s + sh(*build_site_command(nil, staging_url)) + if File.exists?('_config.staging.yml') && !staging_url.empty? + File.delete '_config.staging.yml' + end end # rake test @@ -126,7 +140,7 @@ Rake::Jekyll::GitDeployTask.new(:publish) do |t| } t.jekyll_build = -> (dest_dir) { - Rake.sh(*build_site_command(dest_dir)) + Rake.sh(*build_site_command(dest_dir, ENV['STAGING_URL'].to_s)) } t.skip_commit = -> { @@ -139,15 +153,6 @@ end # rake travis_env desc 'Prepare the Travis CI build environment' task :travis_env do - # Generate a staging config if staging URL is set. - url = ENV['JEKYLL_STAGING_URL'].to_s - unless url.empty? - puts 'Creating _config.staging.yml.' - staging = {'domain' => url, 'baseurl' => url, - 'assets' => {'baseurl' => "#{url}/assets"}} - File.open('_config.staging.yml','w') { |f| f.write staging.to_yaml } - end - # Setup the deploy key. puts 'Adding deploy key.' verbose false do From f203ed6fcc0abc54726fdc6a8a31ba5ae097efa2 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Fri, 5 Jun 2015 12:27:12 -0700 Subject: [PATCH 07/20] Update STAGING_URL in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29c137b..2417720 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ $ git push ### Staging site -If the environment variable `JEKYLL_STAGING_URL` is set, +If the environment variable `STAGING_URL` is set, then this value will be used to set `domain`, `baseurl`, and the assets `baseurl`. This is useful when you want to setup a staging site on a separate development repository. From 9c5c26f054aacecf37105a324332b177aed98985 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Fri, 26 Jun 2015 16:54:06 -0700 Subject: [PATCH 08/20] Update bundle. --- Gemfile.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 07a251f..73893b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,9 +34,9 @@ GEM fast-stemmer (1.0.2) fastimage (1.7.0) addressable (~> 2.3, >= 2.3.5) - ffi (1.9.8) + ffi (1.9.9) formatador (0.2.5) - guard (2.12.5) + guard (2.12.6) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) @@ -83,10 +83,10 @@ GEM sass (~> 3.2) jekyll-watch (1.2.1) listen (~> 2.7) - json (1.8.2) + json (1.8.3) kramdown (1.7.0) liquid (2.6.2) - listen (2.10.0) + listen (2.10.1) celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -94,7 +94,7 @@ GEM mercenary (0.3.5) method_source (0.8.2) mini_magick (4.2.7) - multi_json (1.11.0) + multi_json (1.11.1) nenv (0.2.0) notiffany (0.0.6) nenv (~> 0.1) @@ -109,25 +109,25 @@ GEM pygments.rb (0.6.3) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.2.0) - rack (1.6.1) + rack (1.6.4) rake (10.4.2) - rake-jekyll (1.0.3) + rake-jekyll (1.0.4) rake (~> 10.0) rb-fsevent (0.9.5) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.3) + redcarpet (3.3.2) safe_yaml (1.0.4) - sass (3.4.14) + sass (3.4.15) shellany (0.0.1) slop (3.6.0) - sprockets (2.12.3) + sprockets (2.12.4) 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-helpers (1.2.1) + sprockets (>= 2.2) sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) From 125ed894e04844da54f5ff631a8fdac412f0b914 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Fri, 26 Jun 2015 16:57:58 -0700 Subject: [PATCH 09/20] Update webfontloader to 1.6.3. --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index bbc05a7..b106a2b 100644 --- a/bower.json +++ b/bower.json @@ -21,6 +21,6 @@ "highlightjs": "8.5.0", "normalize-css": "3.0.3", "picturefill": "2.3.1", - "webfontloader": "1.5.18" + "webfontloader": "1.6.3" } } From 49aace0d1edc126b83f9ae3dfe8bc8643f202404 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Wed, 15 Jul 2015 12:55:42 -0700 Subject: [PATCH 10/20] Add empty Disallow directive to robots.txt. --- robots.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/robots.txt b/robots.txt index 7d329b1..eb05362 100644 --- a/robots.txt +++ b/robots.txt @@ -1 +1,2 @@ User-agent: * +Disallow: From b23ac02ccc5599630c277a3b935283769e5887e2 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Wed, 15 Jul 2015 13:02:17 -0700 Subject: [PATCH 11/20] Add 404 page. --- 404.html | 6 ++++++ CHANGELOG.md | 1 + 2 files changed, 7 insertions(+) create mode 100644 404.html diff --git a/404.html b/404.html new file mode 100644 index 0000000..17c7ab2 --- /dev/null +++ b/404.html @@ -0,0 +1,6 @@ +--- +layout: body +title: Page Not Found +--- + +Sorry, but the page you were trying to view does not exist. diff --git a/CHANGELOG.md b/CHANGELOG.md index ef95bde..4b0e219 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Use gist-aysnc bower package. - Remove Sub-content feature. - Add staging environment support for Travis CI builds. +- Add 404 page. [rake-jekyll]: https://github.com/jirutka/rake-jekyll From 5aea71f7ecc8cf45d266c54d49005ba223ed5d73 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Wed, 15 Jul 2015 13:05:12 -0700 Subject: [PATCH 12/20] Update bundle. --- Gemfile.lock | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 73893b8..8af4465 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,11 +34,11 @@ GEM fast-stemmer (1.0.2) fastimage (1.7.0) addressable (~> 2.3, >= 2.3.5) - ffi (1.9.9) + ffi (1.9.10) formatador (0.2.5) - guard (2.12.6) + guard (2.12.8) formatador (>= 0.2.4) - listen (~> 2.7) + listen (>= 2.7, <= 4.0) lumberjack (~> 1.0) nenv (~> 0.1) notiffany (~> 0.0) @@ -84,7 +84,7 @@ GEM jekyll-watch (1.2.1) listen (~> 2.7) json (1.8.3) - kramdown (1.7.0) + kramdown (1.8.0) liquid (2.6.2) listen (2.10.1) celluloid (~> 0.16.0) @@ -94,7 +94,7 @@ GEM mercenary (0.3.5) method_source (0.8.2) mini_magick (4.2.7) - multi_json (1.11.1) + multi_json (1.11.2) nenv (0.2.0) notiffany (0.0.6) nenv (~> 0.1) @@ -118,7 +118,7 @@ GEM ffi (>= 0.5.0) redcarpet (3.3.2) safe_yaml (1.0.4) - sass (3.4.15) + sass (3.4.16) shellany (0.0.1) slop (3.6.0) sprockets (2.12.4) @@ -155,3 +155,6 @@ DEPENDENCIES rake (~> 10.4.2) rake-jekyll (~> 1.0.3) uglifier (~> 2.7.0) + +BUNDLED WITH + 1.10.3 From c0ee79130fba368a723fc1c7b11933d0ac32a994 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Wed, 15 Jul 2015 13:05:40 -0700 Subject: [PATCH 13/20] Update minor bower dependencies. --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index b106a2b..e81d8cb 100644 --- a/bower.json +++ b/bower.json @@ -18,9 +18,9 @@ "foundation": "5.5.2", "gist-async": "1.0.1", "headjs": "1.0.3", - "highlightjs": "8.5.0", + "highlightjs": "8.6.0", "normalize-css": "3.0.3", "picturefill": "2.3.1", - "webfontloader": "1.6.3" + "webfontloader": "1.6.4" } } From f69cce7f0d268fa172336e9cd328ca17bf04270c Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Thu, 16 Jul 2015 00:21:08 -0700 Subject: [PATCH 14/20] Update BUNDLED WITH in bundle. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8af4465..6c71717 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,4 +157,4 @@ DEPENDENCIES uglifier (~> 2.7.0) BUNDLED WITH - 1.10.3 + 1.10.5 From c9fa96dd530f0851e45894b5a2e24ccee2354cfc Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Tue, 28 Jul 2015 10:37:15 -0700 Subject: [PATCH 15/20] Update bundle and minor dependencies. --- Gemfile.lock | 8 ++++---- bower.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6c71717..2f12f4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,7 @@ GEM addressable (~> 2.3, >= 2.3.5) ffi (1.9.10) formatador (0.2.5) - guard (2.12.8) + guard (2.13.0) formatador (>= 0.2.4) listen (>= 2.7, <= 4.0) lumberjack (~> 1.0) @@ -85,7 +85,7 @@ GEM listen (~> 2.7) json (1.8.3) kramdown (1.8.0) - liquid (2.6.2) + liquid (2.6.3) listen (2.10.1) celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) @@ -96,7 +96,7 @@ GEM mini_magick (4.2.7) multi_json (1.11.2) nenv (0.2.0) - notiffany (0.0.6) + notiffany (0.0.7) nenv (~> 0.1) shellany (~> 0.0) parslet (1.5.0) @@ -157,4 +157,4 @@ DEPENDENCIES uglifier (~> 2.7.0) BUNDLED WITH - 1.10.5 + 1.10.6 diff --git a/bower.json b/bower.json index e81d8cb..93555eb 100644 --- a/bower.json +++ b/bower.json @@ -21,6 +21,6 @@ "highlightjs": "8.6.0", "normalize-css": "3.0.3", "picturefill": "2.3.1", - "webfontloader": "1.6.4" + "webfontloader": "1.6.5" } } From d683a377020efc11c029d9d972c08ef43929fa73 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Tue, 28 Jul 2015 10:42:17 -0700 Subject: [PATCH 16/20] Add local bower to speed up Travis build. --- .gitignore | 1 + .travis.yml | 4 ++-- CHANGELOG.md | 1 + package.json | 9 +++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 package.json diff --git a/.gitignore b/.gitignore index 20967cf..d0b9d3b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .sass-cache/ _site/ bower_components/ +node_modules/ diff --git a/.travis.yml b/.travis.yml index 60ce6f1..bb0ef13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,11 @@ cache: bundler: true directories: - bower_components + - node_modules sudo: false before_script: - - npm install -g bower - - bower install + - npm run install # Install the travis gem. # Create a deploy key and encrypt it with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b0e219..3196946 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove Sub-content feature. - Add staging environment support for Travis CI builds. - Add 404 page. +- Optimize Travis build by adding bower to package.json. [rake-jekyll]: https://github.com/jirutka/rake-jekyll diff --git a/package.json b/package.json new file mode 100644 index 0000000..bfca2b5 --- /dev/null +++ b/package.json @@ -0,0 +1,9 @@ +{ + "scripts": { + "install": "bower install" + }, + "private": true, + "devDependencies": { + "bower": "^1.4.1" + } +} From 3dfd0973e08643edd7bdce7ebb5be647bd6061e8 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Tue, 28 Jul 2015 10:43:42 -0700 Subject: [PATCH 17/20] Minor syntax changes to .travis.yml. --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb0ef13..b4e1040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,11 @@ --- -language: [ ruby, node_js ] -rvm: [ 2.2.2 ] -node_js: [ iojs ] +language: + - ruby + - node_js +rvm: + - 2.2.2 +node_js: + - iojs cache: bundler: true directories: From 76ffe6add17c8aa0e245c2c0a34f315408d1d73f Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Tue, 28 Jul 2015 10:46:00 -0700 Subject: [PATCH 18/20] Need to add npm install to .travis.yml. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b4e1040..3af7df6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ cache: sudo: false before_script: + - npm install - npm run install # Install the travis gem. From b8bcdb21aa01f5569fb23d1496587ef2f98aa3e6 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Tue, 28 Jul 2015 10:47:06 -0700 Subject: [PATCH 19/20] Add npm-debug.log to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d0b9d3b..bd9f092 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .jekyll-assets-cache/ .sass-cache/ +npm-debug.log _site/ bower_components/ node_modules/ From e2f8c5aa871da509691545e7df5ae7e18f122d73 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Tue, 28 Jul 2015 11:18:41 -0700 Subject: [PATCH 20/20] Remove extra semicolons in _settings.sass. --- _assets/stylesheets/_settings.sass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_assets/stylesheets/_settings.sass b/_assets/stylesheets/_settings.sass index 91d572a..6eb1e4a 100644 --- a/_assets/stylesheets/_settings.sass +++ b/_assets/stylesheets/_settings.sass @@ -397,7 +397,7 @@ $include-html-global-classes: $include-html-classes // $block-grid-default-spacing: rem-calc(20) // $align-block-grid-to-grid: false -// @if $align-block-grid-to-grid {$block-grid-default-spacing: $column-gutter;} +// @if $align-block-grid-to-grid {$block-grid-default-spacing: $column-gutter} // Enables media queries for block-grid classes. Set to false if writing semantic HTML. // $block-grid-media-queries: true @@ -912,7 +912,7 @@ $include-html-global-classes: $include-html-classes // $orbit-caption-bg: rgba(51,51,51, .8) // $orbit-caption-font-color: $white // $orbit-caption-font-size: rem-calc(14) -// $orbit-caption-position: "bottom"; // Supported values: "bottom", "under" +// $orbit-caption-position: "bottom" // Supported values: "bottom", "under" // $orbit-caption-padding: rem-calc(10 14) // $orbit-caption-height: auto @@ -1413,7 +1413,7 @@ $include-html-global-classes: $include-html-classes // $topbar-link-color-active-hover: $white // $topbar-link-weight: $font-weight-normal // $topbar-link-font-size: rem-calc(13) -// $topbar-link-hover-lightness: -10%; // Darken by 10% +// $topbar-link-hover-lightness: -10% // Darken by 10% // $topbar-link-bg: $topbar-bg // $topbar-link-bg-hover: $jet // $topbar-link-bg-color-hover: $charcoal @@ -1452,12 +1452,12 @@ $include-html-global-classes: $include-html-classes // $topbar-menu-icon-color: $white // $topbar-menu-link-color-toggled: $jumbo // $topbar-menu-icon-color-toggled: $jumbo -// $topbar-menu-icon-position: $opposite-direction; // Change to $default-float for a left menu icon +// $topbar-menu-icon-position: $opposite-direction // Change to $default-float for a left menu icon // Transitions and breakpoint styles // $topbar-transition-speed: 300ms // Using rem-calc for the below breakpoint causes issues with top bar -// $topbar-breakpoint: #{lower-bound($medium-range)}; // Change to 9999px for always mobile layout +// $topbar-breakpoint: #{lower-bound($medium-range)} // Change to 9999px for always mobile layout // $topbar-media-query: "#{$screen} and (min-width:#{lower-bound($topbar-breakpoint)})" // Top-bar input styles @@ -1469,8 +1469,8 @@ $include-html-global-classes: $include-html-classes // Sticky Class // $topbar-sticky-class: ".sticky" -// $topbar-arrows: true; //Set false to remove the triangle icon from the menu item -// $topbar-dropdown-arrows: true; //Set false to remove the \00bb >> text from dropdown subnavigation li// +// $topbar-arrows: true //Set false to remove the triangle icon from the menu item +// $topbar-dropdown-arrows: true //Set false to remove the \00bb >> text from dropdown subnavigation li// // 36. Visibility Classes // - - - - - - - - - - - - - - - - - - - - - - - - -