Michael Rose 6ce8985a93 Merge branch 'scss-cleanup' into gh-pages ... Conflicts: _config.yml _includes/navigation.html _layouts/post.html _sass/_animations.scss _sass/_coderay.scss _sass/_elements.scss _sass/_layout.scss _sass/_site.scss _sass/_syntax.scss _sass/elements.scss assets/css/main.scss		2015-03-03 13:17:27 -05:00
..
ad-footer.html	Drop the http	2014-08-23 17:50:29 -04:00
ad-sidebar.html	Use Google's responsive ads	2014-09-04 15:06:14 -04:00
browser-upgrade.html	Let's get this party started	2013-06-25 16:19:49 -04:00
disqus-comments.html	Rename disqus_comments.html to disqus-comments.html	2015-03-03 13:11:18 -05:00
feed-footer.html	Move feed footer to an include	2015-01-30 09:36:34 -05:00
footer.html	Add Pinterest to footer	2015-03-02 12:40:52 -05:00
head.html	Remove Google Authorship	2015-01-20 13:09:29 -05:00
navigation.html	Adjust animation used on masthead elements	2015-03-03 13:01:45 -05:00
open-graph.html	Update theme to support Jekyll 2.x newness	2014-08-08 16:07:20 -04:00
scripts.html	Move Disqus script inside conditional to avoid <noscript> text from appearing on pages that have comments disabled	2015-01-22 11:24:59 -05:00
social-share.html	Move social sharing links into an include	2014-11-11 09:23:50 -05:00