diff --git a/Gemfile b/Gemfile index d2e1a45..33d9d3b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ source "https://rubygems.org" gem 'github-pages', group: :jekyll_plugins -gem 'wdm', '>= 0.1.0' if Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock index f31e5da..83d8d45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,12 +19,12 @@ GEM ethon (0.11.0) ffi (>= 1.3.0) execjs (2.7.0) - faraday (0.13.1) + faraday (0.14.0) multipart-post (>= 1.2, < 3) ffi (1.9.18) forwardable-extended (2.6.0) gemoji (3.0.0) - github-pages (172) + github-pages (175) activesupport (= 4.2.9) github-pages-health-check (= 1.3.5) jekyll (= 3.6.2) @@ -61,7 +61,7 @@ GEM jekyll-theme-time-machine (= 0.1.0) jekyll-titles-from-headings (= 0.5.0) jemoji (= 0.8.1) - kramdown (= 1.14.0) + kramdown (= 1.16.2) liquid (= 4.0.0) listen (= 3.0.6) mercenary (~> 0.3) @@ -77,7 +77,7 @@ GEM html-pipeline (2.7.1) activesupport (>= 2) nokogiri (>= 1.4) - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) jekyll (3.6.2) addressable (~> 2.4) @@ -184,7 +184,7 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0) - kramdown (1.14.0) + kramdown (1.16.2) liquid (4.0.0) listen (3.0.6) rb-fsevent (>= 0.9.3) @@ -193,10 +193,10 @@ GEM mini_portile2 (2.3.0) minima (2.1.1) jekyll (~> 3.3) - minitest (5.11.0) + minitest (5.11.3) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) @@ -211,7 +211,7 @@ GEM i18n rubyzip (1.2.1) safe_yaml (1.0.4) - sass (3.5.4) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -235,4 +235,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 1.15.1 + 1.16.1 diff --git a/_includes/disqus.html b/_includes/disqus.html index 8ecd0ac..524c694 100644 --- a/_includes/disqus.html +++ b/_includes/disqus.html @@ -1,25 +1,14 @@ -{% if site.disqus_shortname %} +{% if site.format == "web" %}{% unless page.focus == "noform" %} +
+ - -{% endif %} + /* * * DON'T EDIT BELOW THIS LINE * * */ + (function() { + var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; + dsq.src = '//' + {{site.disqus_shortname}} + '.disqus.com/embed.js'; + (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); + })(); + + +{% endunless %}{% endif %} diff --git a/pages/mydoc/mydoc_about.md b/pages/mydoc/mydoc_about.md index c7411ec..7c35791 100644 --- a/pages/mydoc/mydoc_about.md +++ b/pages/mydoc/mydoc_about.md @@ -9,8 +9,6 @@ permalink: mydoc_about.html folder: mydoc --- -{{site.url}}{{site.baseurl}}{{page.url}} - My name is Tom Johnson, and I'm a technical writer, blogger, and podcaster based in San Jose, California. For more details, see my [technical writing blog](http://idratherbewriting.com) and my [course on API documentation](http://idratherbewriting.com/learnapidoc/). See [my blog's about page](http://idratherbewriting.com/aboutme/) for more details about me. I have used this theme and variations of it for various documentation projects. This theme has undergone several major iterations, and now it's fairly stable and full of all the features that I need. You are welcome to use it for your documentation projects for free.