Merge branch 'master' into hollenberry/contributing-md

CONTRIBUTING.md

@@ -1,5 +1,9 @@
 # Help Us Improve These Materials
 
-We're always looking for contributions to help improve these materials. If you have corrections, polish, or materials contributions, please submit them via a [Pull Request](https://help.github.com/articles/using-pull-requests). 
+We're always looking for contributions to help improve these materials. If you have corrections, polish, or materials contributions, please submit them via a [Pull Request](https://help.github.com/articles/using-pull-requests).
 
 If your contribution is larger than a syntax fix or sentence re-wording, please initiate a discussion via a new Issue (type `c` after switching focus to the [Issues](https://github.com/github/training-kit/issues) tab) so we can help guide your contribution to the right location in the materials.
+
+## Using Primer
+
+This site uses GitHub's CSS toolkit called [Primer](https://github.com/primer/primer-css). It's easy to use, and if your contribution requires some design or front-end work you should check out the [Primer Docs](http://primercss.io/).

Gemfile.lock

@@ -17,21 +17,21 @@ GEM
     ethon (0.10.1)
       ffi (>= 1.3.0)
     execjs (2.7.0)
-    faraday (0.13.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    github-pages (151)
+    github-pages (155)
       activesupport (= 4.2.8)
       github-pages-health-check (= 1.3.5)
-      jekyll (= 3.5.1)
+      jekyll (= 3.5.2)
       jekyll-avatar (= 0.4.2)
       jekyll-coffeescript (= 1.0.1)
       jekyll-default-layout (= 0.1.4)
       jekyll-feed (= 0.9.2)
       jekyll-gist (= 1.4.1)
-      jekyll-github-metadata (= 2.6.0)
+      jekyll-github-metadata (= 2.8.0)
       jekyll-mentions (= 1.2.0)
       jekyll-optional-front-matter (= 0.2.0)
       jekyll-paginate (= 1.1.0)
@@ -51,7 +51,7 @@ GEM
       jekyll-theme-midnight (= 0.1.0)
       jekyll-theme-minimal (= 0.1.0)
       jekyll-theme-modernist (= 0.1.0)
-      jekyll-theme-primer (= 0.4.0)
+      jekyll-theme-primer (= 0.5.0)
       jekyll-theme-slate (= 0.1.0)
       jekyll-theme-tactile (= 0.1.0)
       jekyll-theme-time-machine (= 0.1.0)
@@ -70,7 +70,7 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 2.0)
       typhoeus (~> 0.7)
-    html-pipeline (2.6.0)
+    html-pipeline (2.7.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     html-proofer (3.7.2)
@@ -83,7 +83,7 @@ GEM
       typhoeus (~> 0.7)
       yell (~> 2.0)
     i18n (0.8.6)
-    jekyll (3.5.1)
+    jekyll (3.5.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
@@ -104,7 +104,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-gist (1.4.1)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.6.0)
+    jekyll-github-metadata (2.8.0)
       jekyll (~> 3.1)
       octokit (~> 4.0, != 4.4.0)
     jekyll-mentions (1.2.0)
@@ -154,7 +154,7 @@ GEM
     jekyll-theme-modernist (0.1.0)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.4.0)
+    jekyll-theme-primer (0.5.0)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.2)
     jekyll-theme-slate (0.1.0)

_config.yml

@@ -78,7 +78,9 @@ include:
 - _stylesheets
 - _javascript
 sass:
-  sass_dir: assets/_scss
+  load_paths:
+    - assets/_scss
+    - node_modules
   style: :compressed
 
 # Custom site configuration

_includes/breadcrumbs.html

@@ -1,5 +1,3 @@
-{% include base_path %}
-
 {% case site.categories.type %}
   {% when "liquid" %}
     {% assign path_type = "#" %}
@@ -14,8 +12,8 @@
   {% assign crumb_path = site.categories.path %}
 {% endif %}
 
-<nav class="breadcrumbs">
-  <ol itemscope itemtype="http://schema.org/BreadcrumbList">
+<nav class="bg-blue-light p-responsive py-2 border-bottom">
+  <ol itemscope itemtype="http://schema.org/BreadcrumbList" class="d-flex list-style-none container-lg mx-auto">
     {% assign crumbs = page.url | split: '/' %}
     {% assign i = 1 %}
     {% for crumb in crumbs offset: 1 %}
@@ -24,7 +22,7 @@
           <a href="{{ site.baseurl }}/" itemprop="item"><span itemprop="name">{{ site.data.ui-text[site.locale].breadcrumb_home_label }}</span></a>
           <meta itemprop="position" content="{{ i }}" />
         </li>
-        <span class="sep">{{ site.data.ui-text[site.locale].breadcrumb_separator }}</span>
+        <span class="mx-2 text-gray">{{ site.data.ui-text[site.locale].breadcrumb_separator }}</span>
       {% endif %}
       {% if forloop.last %}
         <li class="current">{{ page.title }}</li>
@@ -34,7 +32,7 @@
           <a href="{{ site.baseurl }}{{ crumb | downcase | replace: '%20', '-' | prepend: path_type | prepend: crumb_path }}" itemprop="item"><span itemprop="name">{{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}</span></a>
           <meta itemprop="position" content="{{ i }}" />
         </li>
-        <span class="sep">{{ site.data.ui-text[site.locale].breadcrumb_separator }}</span>
+        <span class="mx-2 text-gray">{{ site.data.ui-text[site.locale].breadcrumb_separator }}</span>
       {% endif %}
     {% endfor %}
   </ol>

_includes/footer.html

@@ -1,11 +1,9 @@
-{% include base_path %}
-
-<div class="page__footer-follow text-center">
-  <p style="margin-bottom: 0.5em"><a href="{{ site.baseurl }}/community/">Made with :heart: by :octocat:s and friends</a></p>
-  <ul class="social-icons">
-    <li><a href="{{ site.baseurl }}/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label }}</a></li>
-    <li><a href="{{ site.baseurl }}/community"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Community</a></li>
-  </ul>
-</div>
-
-<div class="page__footer-copyright text-center">&copy; {{ site.time | date: '%Y' }} {{ site.name }} {{ site.data.ui-text[site.locale].powered_by }} <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
+<footer class="bg-gray-light border-top py-4 text-gray text-center mt-6">
+  <a href="{{ site.baseurl }}/community/" class="text-gray-dark mb-2">Made with :heart: by :octocat:s and friends</a>
+  <div class="d-flex flex-justify-center text-uppercase text-bold my-1">
+    <a href="{{ site.baseurl }}/feed.xml" class="d-flex flex-items-center text-gray text-uppercase mr-4"><div class="d-flex mr-1">{% include octicons/rss.svg %}</div> {{ site.data.ui-text[site.locale].feed_label }}</a>
+    <a href="{{ site.baseurl }}/community" class="d-flex flex-items-center text-gray text-uppercase"><div class="d-flex mr-1">{% include octicons/organization.svg %}</div> Community</a>
+  </div>
+
+  <p>&copy; {{ site.time | date: '%Y' }} {{ site.name }} {{ site.data.ui-text[site.locale].powered_by }} <a href="http://jekyllrb.com" rel="nofollow" class="text-gray-dark">Jekyll</a> &amp; <a href="https://github.com/primer/primer-css" rel="nofollow" class="text-gray-dark">Primer</a>.</p>
+</footer>