From b62f1f8df0006bb323c0207bfe699c1b12674a3b Mon Sep 17 00:00:00 2001 From: Will Koehler Date: Sat, 16 Aug 2014 18:20:01 -0400 Subject: [PATCH 01/41] Add .sass_cache to .gitignore. --- .gitignore | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e1ca95b80..da1dd5293 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -_site/ -.DS_Store +/.sass-cache +/_site + +# Ignore OSX files like: +.DS_Store \ No newline at end of file From 07c1de3de2144fb10c0be2558cefcadb1f3638db Mon Sep 17 00:00:00 2001 From: Will Koehler Date: Sat, 16 Aug 2014 23:06:59 -0400 Subject: [PATCH 02/41] Always include _google-analytics.html partial - leave partial empty if no analytics. --- _config.yml | 6 ------ _includes/_scripts.html | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/_config.yml b/_config.yml index bbc25a9e4..c9f9e2014 100644 --- a/_config.yml +++ b/_config.yml @@ -29,12 +29,6 @@ inc: gplus: false hn: false - - # Analytics - analytics: - google: false # Add tracking code in _includes/_google-analytics.html - - # Google Fonts # eg. 'Droid+Sans:400,700|Droid+Serif:400,700' google_font: 'Droid+Sans:400,700' diff --git a/_includes/_scripts.html b/_includes/_scripts.html index f0894baf5..f1f126084 100644 --- a/_includes/_scripts.html +++ b/_includes/_scripts.html @@ -24,6 +24,5 @@ s.parentNode.insertBefore(g, s); }(document, 'script')); {% endif %} -{% if site.inc.analytics.google %} - {% include _google-analytics.html %} -{% endif %} + +{% include _google-analytics.html %} From 02ed4fb360a124da14eab80cb8debc3e68dfdd4a Mon Sep 17 00:00:00 2001 From: Will Koehler Date: Sat, 16 Aug 2014 23:10:07 -0400 Subject: [PATCH 03/41] Rename 'inc' config block to 'info'. --- _config.yml | 2 +- _includes/_disqus.html | 2 +- _includes/_scripts.html | 8 ++++---- _includes/_social.html | 12 +++++------ _layouts/base.html | 44 ++++++++++++++++++++--------------------- _layouts/post.html | 2 +- index.html | 14 ++++++------- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/_config.yml b/_config.yml index c9f9e2014..1facda241 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,4 @@ -inc: +info: # Blog Information title: "Jekyll Incorporated" subtitle: "Modern Jekyll based blog for companies" diff --git a/_includes/_disqus.html b/_includes/_disqus.html index 7cda7a572..66989aa8d 100644 --- a/_includes/_disqus.html +++ b/_includes/_disqus.html @@ -1,7 +1,7 @@
{% javascript main %} -{% if site.inc.sharing.twitter %}{% endif %} -{% if site.inc.sharing.facebook %}
+{% if site.info.sharing.twitter %}{% endif %} +{% if site.info.sharing.facebook %}
{% endif %} -{% if site.inc.sharing.gplus %}{% endif %} -{% if site.inc.sharing.hn %}{% endif %} {% if site.info.sharing.hn %} {% endif %} {% include _google-analytics.html %} diff --git a/_includes/_social-sharing.html b/_includes/_social-sharing.html index 9857dd523..4c2b3a353 100644 --- a/_includes/_social-sharing.html +++ b/_includes/_social-sharing.html @@ -17,7 +17,7 @@ {% if site.info.sharing.hn %}
- Vote on HN + Vote on Hacker News
{% endif %} From 374aca6cbc70d56bdc3f350454659ace288f626b Mon Sep 17 00:00:00 2001 From: Will Koehler Date: Thu, 21 Aug 2014 13:22:37 -0400 Subject: [PATCH 31/41] Fix alignment of social share buttons. - fix vertical alignment of FB share button - adjust spacing between buttons --- _assets/stylesheets/_article.scss | 7 ++++++- _includes/_social-sharing.html | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/_assets/stylesheets/_article.scss b/_assets/stylesheets/_article.scss index 887456d0a..48c95571a 100644 --- a/_assets/stylesheets/_article.scss +++ b/_assets/stylesheets/_article.scss @@ -13,7 +13,12 @@ article { > div { display:inline-block; - min-width:120px; + width: 100px; + + &.google { width: 85px; } + + // vertically align facebook like button with other sharing icons + .fb-like > span { vertical-align: baseline !important; } } } diff --git a/_includes/_social-sharing.html b/_includes/_social-sharing.html index 4c2b3a353..8c2305fc3 100644 --- a/_includes/_social-sharing.html +++ b/_includes/_social-sharing.html @@ -1,22 +1,23 @@ {% if site.info.sharing.twitter or site.info.sharing.facebook or site.info.sharing.gplus or site.info.sharing.hn %}