Merge remote-tracking branch 'upstream/master'

cfpb · Oct 5, 2016 · 36903d7 · 36903d7
2 parents 773d541 + 63e6449
commit 36903d7
Show file tree

Hide file tree

Showing 18 changed files with 339 additions and 180 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,140 +1,128 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    activesupport (4.2.5)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    blankslate (2.1.2.4)
-    classifier-reborn (2.0.4)
-      fast-stemmer (~> 1.0)
+    addressable (2.4.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
     colorator (0.1)
-    ethon (0.8.0)
+    ethon (0.9.0)
       ffi (>= 1.3.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fast-stemmer (1.0.2)
     ffi (1.9.10)
     gemoji (2.1.0)
-    github-pages (40)
-      RedCloth (= 4.2.9)
-      github-pages-health-check (= 0.5.3)
-      jekyll (= 2.4.0)
+    github-pages (83)
+      github-pages-health-check (= 1.1.0)
+      jekyll (= 3.1.6)
       jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.3.1)
+      jekyll-feed (= 0.5.1)
       jekyll-gist (= 1.4.0)
-      jekyll-mentions (= 0.2.1)
+      jekyll-github-metadata (= 2.0.0)
+      jekyll-mentions (= 1.1.2)
       jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.8.0)
+      jekyll-redirect-from (= 0.10.0)
       jekyll-sass-converter (= 1.3.0)
-      jekyll-sitemap (= 0.9.0)
-      jemoji (= 0.5.0)
-      kramdown (= 1.9.0)
-      liquid (= 2.6.2)
-      maruku (= 0.7.0)
+      jekyll-seo-tag (= 2.0.0)
+      jekyll-sitemap (= 0.10.0)
+      jemoji (= 0.6.2)
+      kramdown (= 1.11.1)
+      liquid (= 3.0.6)
+      listen (= 3.0.6)
       mercenary (~> 0.3)
-      pygments.rb (= 0.6.3)
-      rdiscount (= 2.1.8)
-      redcarpet (= 3.3.3)
+      rouge (= 1.10.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (0.5.3)
+    github-pages-health-check (1.1.0)
       addressable (~> 2.3)
       net-dns (~> 0.8)
+      octokit (~> 4.0)
       public_suffix (~> 1.4)
       typhoeus (~> 0.7)
-    html-pipeline (1.9.0)
-      activesupport (>= 2)
-      nokogiri (~> 1.4)
+    html-pipeline (2.4.1)
+      activesupport (>= 2, < 5)
+      nokogiri (>= 1.4)
     i18n (0.7.0)
-    jekyll (2.4.0)
-      classifier-reborn (~> 2.0)
+    jekyll (3.1.6)
       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.1)
+    jekyll-feed (0.5.1)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-mentions (0.2.1)
-      html-pipeline (~> 1.9.0)
-      jekyll (~> 2.0)
+    jekyll-github-metadata (2.0.0)
+      jekyll (~> 3.1)
+      octokit (~> 4.0)
+    jekyll-mentions (1.1.2)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.8.0)
+    jekyll-redirect-from (0.10.0)
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-sitemap (0.9.0)
-    jekyll-watch (1.3.0)
-      listen (~> 3.0)
-    jemoji (0.5.0)
+    jekyll-seo-tag (2.0.0)
+      jekyll (~> 3.1)
+    jekyll-sitemap (0.10.0)
+    jekyll-watch (1.4.0)
+      listen (~> 3.0, < 3.1)
+    jemoji (0.6.2)
       gemoji (~> 2.0)
-      html-pipeline (~> 1.9)
-      jekyll (>= 2.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
     json (1.8.3)
-    kramdown (1.9.0)
-    liquid (2.6.2)
-    listen (3.0.5)
+    kramdown (1.11.1)
+    liquid (3.0.6)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    maruku (0.7.0)
-    mercenary (0.3.5)
-    mini_portile2 (2.0.0)
-    minitest (5.8.3)
+      rb-inotify (>= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     multipart-post (2.0.0)
     net-dns (0.8.0)
-    nokogiri (1.6.7)
-      mini_portile2 (~> 2.0.0.rc2)
-    octokit (4.2.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    public_suffix (1.5.2)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    pkg-config (1.1.7)
+    public_suffix (1.5.3)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    redcarpet (3.3.3)
+    rouge (1.10.1)
     safe_yaml (1.0.4)
-    sass (3.4.19)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
+    sass (3.4.22)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    terminal-table (1.5.2)
+    terminal-table (1.6.0)
     thread_safe (0.3.5)
-    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
 
 DEPENDENCIES
   github-pages
+
+BUNDLED WITH
+   1.10.6
diff --git a/COPYING.txt → LICENSE b/COPYING.txt → LICENSE
diff --git a/README.md b/README.md
@@ -23,6 +23,13 @@ Run the following command to install it:
 bundle install
 ```
 
+**Note:** As of 6/23/16, you may need to run this command before running
+`bundle install` to handle a bug in one of the dependencies:
+
+```sh
+bundle config build.nokogiri --use-system-libraries
+```
+
 [Fork and clone the repo](https://help.github.com/articles/fork-a-repo/)
 to your local machine.
 

diff --git a/_config.yml b/_config.yml
@@ -1,9 +1,9 @@
 baseurl:     ''
 exclude:     [README.md, Gemfile, Gemfile.lock, vendor, _site]
-permalink:   /articles/:title
-highlighter: pygments
+permalink:   /articles/:title/
+highlighter: rouge
 markdown:    kramdown
 
 title: CFPB Open Tech
 url: "https://cfpb.github.io/"
-description: "Learn about the design and development work the Consumer Financial Protection Bureau undertakes to support its mission."
+description: "Learn about the technology work the Consumer Financial Protection Bureau undertakes to support its mission."
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,6 +1,6 @@
         <div class="wrap">
             <a href="http://www.consumerfinance.gov/" target="_blank">
-                <img class="logo" src="{% if page.assetpath %}{{ page.assetpath }}{% endif %}img/logo_210.png"
+                <img class="logo" src="{{ site.github.url }}/img/logo_210.png"
                      alt="Consumer Financial Protection Bureau">
             </a>
             <h1><a class="home" href="/"><span>CFPB</span> Open Tech</a></h1>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -13,16 +13,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <link rel="stylesheet" href="//fast.fonts.net/cssapi/0a274127-32a9-474a-bbdb-f23f410e88c5.css">
-    <link rel="stylesheet" href="{% if page.assetpath %}{{ page.assetpath }}{% endif %}css/site.css">
+    <link rel="stylesheet" href="{{ site.github.url }}/css/site.css">
 
-    <link rel="alternate" type="application/rss+xml" title="{{ site.name }} &raquo; Feed" href="/feed/">
+    <link rel="alternate" type="application/rss+xml" title="{{ site.name }} &raquo; Feed" href="{{ site.github.url }}/feed/">
+    <link rel="canonical" href="{{ site.github.url }}{{ page.url }}" />
 
 <!--[if lt IE 9]>
-    <link rel="stylesheet" href="{% if page.assetpath %}{{ page.assetpath }}{% endif %}css/ie8.css">
-    <script src="{% if page.assetpath %}{{ page.assetpath }}{% endif %}js/respond.min.js" media="all"></script>
+    <link rel="stylesheet" href="/css/ie8.css">
+    <script src="{{ site.github.url }}/js/respond.min.js" media="all"></script>
 <![endif]-->
 
-    <script src="{% if page.assetpath %}{{ page.assetpath }}{% endif %}js/modernizr-afontgarde.min.js" media="all"></script>
+    <script src="{{ site.github.url }}/js/modernizr-afontgarde.min.js" media="all"></script>
 </head>
 
 <body>
@@ -55,7 +56,7 @@
     </footer>
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-    <script src="{% if page.assetpath %}{{ page.assetpath }}{% endif %}js/afontgarde.js"></script>
+    <script src="{{ site.github.url }}/js/afontgarde.js"></script>
     <script>
         AFontGarde( 'CFPB_Icons', '\uE600\uE601\uE602\uE605' );
         var consoleText = 'Hey! If you\'re viewing this, you should %capply() %cto our Technology and Innovation Fellowship. http://www.consumerfinance.gov/jobs/technology-innovation-fellows/';
@@ -72,7 +73,7 @@
         }
     </script>
 
-    <script src="{% if page.assetpath %}{{ page.assetpath }}{% endif %}js/site.js"></script>
+    <script src="{{ site.github.url }}/js/site.js"></script>
 
 </body>
 

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -7,11 +7,11 @@
     <article class="entry entry__single">
         <div class="entry__single_wrap">
             <h1 class="entry_title">{{ page.title }}</h1>
-            
+
             {% if page.tagline %}
             <p class="entry_tagline">{{ page.tagline }}</p>
             {% endif %}
-            
+
             <div class="entry_meta">
                 {% if page.author %}
                 By <span class="author">{{ page.author }}</span> &ndash;
@@ -26,7 +26,8 @@ <h1 class="entry_title">{{ page.title }}</h1>
 
             {{ content }}
 
-<!--             {% if page.tags %}
+        {% comment %}
+            {% if page.tags %}
                 <div class="tags cf">
                     <h4 class="tags_head">Tags:</h4>
                     <ul class="tag-list">
@@ -37,32 +38,8 @@ <h4 class="tags_head">Tags:</h4>
                         {% endfor %}
                     </ul>
                 </div>
-            {% endif %} -->
-
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-                /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-                var disqus_shortname = 'cfpbopentech'; // required: replace example with your forum shortname
-
-                /* * * DON'T EDIT BELOW THIS LINE * * */
-                (function() {
-                    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-                    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-                    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-                })();
-            </script>
-            <noscript>
-                Please enable JavaScript to view the
-                <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
-            </noscript>
-            <a href="http://disqus.com" class="dsq-brlink">
-                comments powered by <span class="logo-disqus">Disqus</span>
-            </a>
-
-            <p class="comment-policy">
-                CFPB Open Tech follows the
-                <a href="http://www.consumerfinance.gov/comment-policy">consumerfinance.gov comment policy</a>.
-            </p>
+            {% endif %}
+        {% endcomment %}
         </div>
     </article>
 
@@ -71,10 +48,10 @@ <h4 class="tags_head">Tags:</h4>
             <h2 class="sidebar_head">More articles</h2>
 
             <ul class="sidebar_list nav-list">
-            {% for post in site.posts limit:10 %}
+            {% for post in site.posts limit:5 %}
                 <li class="sidebar_list_item">
                     <h3 class="sidebar_list_item_head">
-                        <a href="../../{{ post.url | remove_first:'/'}}/">
+                        <a href="../../{{ post.url | remove_first:'/'}}">
                             {{ post.title }}
                         </a>
                     </h3>
@@ -94,11 +71,10 @@ <h3 class="sidebar_list_item_head">
             {% endfor %}
             </ul>
 
-            <!-- Hide until we have published at least 4 articles -->
-            <!-- <a class="more-articles_read-more-link call-to-action__icon"
-               href="../../articles/">
-               Read more articles <i class="icon-right"></i>
-            </a> -->
+            <a class="call-to-action"
+               href="../">
+               View full archive
+            </a>
         </div>
     </section>
 </div>