uswds-jekyll 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef75b2d7d836bddafdb82b872209c91745294ca
-  data.tar.gz: 93ea359defb24c65bddb2df65c4a734d6a5b8649
+  metadata.gz: ae501ffb083eb93864a6132568dfc1b9848a9169
+  data.tar.gz: b1bbb0f4841256ee976f9b29a6646fbb764a50b6
 SHA512:
-  metadata.gz: 2a499c57a4ac50e9d768d5c5b77a18fbe5a502e9db01591ff400c36d222466677134ed58610306f68922e3591c5f4ae65231b41979367683345d61fdeffd4be5
-  data.tar.gz: 225e549ef3286f9ca5267c2f2deea723bb41f58af30812d01d670ae5cda1570a8f57644bad92202c5cf6f4c761229a075f325539396e828e153d8df7eedf0c8c
+  metadata.gz: 2ea1f74b94ad343f8b617b12e840078647462ecaf619fe77174574ce224fbbeecc7728e384339cc1d15c2b1eaf7cc328dac9c7177361d6c612ac5585c4aa3c98
+  data.tar.gz: c9fd28ac2130efbc0c9ae8e0ecb84ab6318d6f86a96723ccf6dbd344ac3504d88b023db3d2a67814d648913b89d12c633b10ef4090e4e1422f60f60af0de6c8a

data/README.md

@@ -27,9 +27,10 @@ This is a [Jekyll theme](https://jekyllrb.com/docs/themes/) for the
     - [Header](#header)
     - [Footer](#footer)
 1. [Layouts](#layouts)
-    - [Base](#layout-base)
-    - [Docs](#layout-docs)
-    - [Landing](#layout-landing)
+    - [Default](#layout-default)
+    - [Page](#layout-page)
+    - [Home](#layout-home)
+    - [Post](#layout-post)
     - [Search results](#search-results)
 
 
@@ -40,7 +41,7 @@ This is a [Jekyll theme](https://jekyllrb.com/docs/themes/) for the
    like so:
 
     ```ruby
-    gem 'uswds-jekyll', :git => 'https://github.com/18F/uswds-jekyll.git'
+    gem 'uswds-jekyll'
     ```
 1. Install the `jekyll_pages_api_search` by adding it to your `Gemfile`
     ```
@@ -119,13 +120,10 @@ To reference a specific version of this plugin:
 1. Visit the [releases page](https://github.com/18F/uswds-jekyll/releases) and
    decide which version you want to use.
 
-1. Add or update the `:tag` argument for this gem in your `Gemfile` to the name
-   of the release tag, e.g.
+1. Specify the version in your `Gemfile`.
 
     ```ruby
-    gem 'uswds-jekyll', \
-      :git => 'https://github.com/18F/uswds-jekyll.git', \
-      :tag => 'v0.1.1'
+    gem 'uswds-jekyll', '1.4.1'
     ```
 
 ## Configuration
@@ -136,7 +134,7 @@ project's [data files](https://jekyllrb.com/docs/datafiles/). See
 this project's [data directory](_data) for reference configurations
 of each component.
 
-The [base layout](#layout-base) also provides a mechanism for
+The [default layout](#layout-default) also provides a mechanism for
 automatically including [stylesheets](#stylesheets) and
 [scripts](#scripts) on a site-wide, layout-wide, and per-page
 basis. See [asset load order](#asset-load-order) for more
@@ -185,7 +183,7 @@ more info.
 
 ### Page subnavigation
 
-If you're using the [docs layout](#layout-docs), each page may declare its own
+If you're using the [page layout](#layout-page), each page may declare its own
 side navigation and subnavigation in its [front matter]:
 
 ```md
@@ -240,7 +238,7 @@ redcarpet:
 
 Search uses the [Search results](#search-results) page layout.
 
-**Pro tip:** use [Jekyll front matter defaults](https://jekyllrb.com/docs/configuration/#front-matter-defaults) to hide directories from showing in search results. 
+**Pro tip:** use [Jekyll front matter defaults](https://jekyllrb.com/docs/configuration/#front-matter-defaults) to hide directories from showing in search results.
 
 ## Assets
 
@@ -388,15 +386,15 @@ your site by placing a file with the same name into your site's
 - To change how [stylesheets](#stylesheets) are loaded or
   referenced, you can create your own `_includes/styles.html`,
   which will subsequently change how stylesheets are loaded in all
-  layouts that inherit from the USWDS [base layout](#layout-base).
+  layouts that inherit from the USWDS [default layout](#layout-default).
 
 - You can change how the side navigation is rendered (but not which
-  data it receives) in the [docs layout](#layout-docs) by creating
+  data it receives) in the [page layout](#layout-page) by creating
   your own `_includes/sidenav.html`.
 
 - You can change how and whether the side navigation is displayed
-  at all in the [docs layout](#layout-docs) by overriding
-  `_layouts/docs.html`.
+  at all in the [page layout](#layout-page) by overriding
+  `_layouts/page.html`.
 
 ## Components
 
@@ -458,21 +456,21 @@ layout: name
 ---
 ```
 
-### `layout: base`
+### `layout: default`
 
 This is the bare-bones Standards layout, which does all of the
 basic page scaffolding then drops the page content into the
 `<main>` element. All of the other layouts "inherit" this one and
 provide other features in the content block.
 
-The base layout provides a layout [front matter] hook to add
+The default layout provides a layout [front matter] hook to add
 attributes to the `<main>` element. You can see how this works in
-the [docs layout](_layouts/docs.html#L3-L4).
+the [page layout](_layouts/page.html#L3-L4).
 
 
-### `layout: landing`
+### `layout: home`
 
-This layout implements the [landing page
+This layout implements the [home page
 template](https://standards.usa.gov/page-templates/landing/), which
 accommodates the following [front matter]:
 
@@ -507,11 +505,11 @@ graphics:
 graphics_position: (before|after)
 ```
 
-Check out the YAML front matter in the [landing demo
-page](demo/landing.html) for an example of how to structure it.
+Check out the YAML front matter in the [home demo
+page](demo/home.html) for an example of how to structure it.
 
 
-### `layout: docs`
+### `layout: page`
 
 This layout implements the [document page
 template](https://standards.usa.gov/page-templates/docs/), and
@@ -531,10 +529,14 @@ accommodates an optional side navigation. Supported [front matter]:
     `site.baseurl`** because this breaks hash links prefixed with
     `#`.
 
-See the [docs demo page](demo/docs.md) for an example of how this
+See the [page demo page](demo/page.md) for an example of how this
 works, and see [_data/navigation.yml](_data/navigation.yml) for how
 to structure named navigation data for your site.
 
+### `layout: post`
+
+This layout is identical to the layout `page` and is included to allow for easier site creation using  `Jekyll new`.
+
 ### `layout: search-results`
 
 This layout is for search results and contains the `jekyll_pages_api_search_results`

data/_includes/components/footer.html

@@ -29,23 +29,29 @@
   </div>
   {% endif %}
 
-  {% if footer.contact %}
+  {% if footer.logos or footer.heading or footer.contact %}
   <div class="usa-footer-secondary_section">
     <div class="usa-grid">
       <div class="usa-footer-logo usa-width-one-half">
-        {% for logo in footer.logos -%}
-          {% if logo.url %}<a href="{{ logo.url }}">{% endif %}
-        <img class="usa-footer-logo-img" src="{{ logo.src | relative_url }}" alt="{{ logo.alt }}"
-          {% if logo.width %}width="{{ logo.width }}"{% endif %}
-          {% if logo.height %}height="{{ logo.height }}"{% endif %}>
-          {% if logo.url %}</a>{% endif %}
-        {% endfor %}
+        {% if footer.logos %}
+          {% for logo in footer.logos -%}
+            {% if logo.url %}
+        <a href="{{ logo.url }}">
+            {% endif %}
+          <img class="usa-footer-logo-img" src="{{ logo.src | relative_url }}" alt="{{ logo.alt }}" {% if logo.width %}width="{{ logo.width }}"{% endif %} {% if logo.height %}height="{{ logo.height }}"{% endif %}>
+            {% if logo.url %}
+        </a>
+            {% endif %}
+          {% endfor %}
+        {% endif %}
+
         {% if footer.heading %}
         <h3 class="usa-footer-logo-heading">{{ footer.heading }}</h3>
         {% endif %}
       </div>
-      <div class="usa-footer-contact-links usa-width-one-half">
 
+      {% if footer.contact %}
+      <div class="usa-footer-contact-links usa-width-one-half">
         {% assign contact_links = site.data.navigation[footer.contact.links] | default: footer.contact.links %}
         {% for _link in contact_links %}
         <a class="usa-link-{{ _link.type | default: 'generic' }}" href="{% if _link.external == true %}{{ _link.href }}{% else %}{{ _link.href | relative_url }}{% endif %}">
@@ -61,7 +67,7 @@
           {{ footer.contact.address | markdownify }}
         </address>
         {% endif %}
-
+      {% endif %}
       </div>
     </div>
   </div>

data/_layouts/{landing.html → home.html}

@@ -1,5 +1,5 @@
 ---
-layout: base
+layout: default
 ---
 
 {% assign hero = page.hero %}

data/_layouts/{docs.html → page.html}

@@ -1,5 +1,5 @@
 ---
-layout: base
+layout: default
 main:
   class: usa-grid usa-section usa-content usa-layout-docs
 ---

data/_layouts/post.html

@@ -0,0 +1,19 @@
+---
+layout: default
+main:
+  class: usa-grid usa-section usa-content usa-layout-docs
+---
+{% assign sidenav = site.data.navigation[page.sidenav] | default: page.sidenav %}
+{% if sidenav %}
+<aside class="usa-width-one-fourth usa-layout-docs-sidenav">
+  {% include sidenav.html links=sidenav %}
+</aside>
+
+<div class="usa-width-three-fourths usa-layout-docs-main_content">
+  {{ content }}
+</div>
+{% else %}
+<div class="usa-layout-docs-main_content">
+  {{ content }}
+</div>
+{% endif %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uswds-jekyll
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Shawn Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -78,9 +78,10 @@ files:
 - _includes/skipnav.html
 - _includes/styles.html
 - _includes/subnav.html
-- _layouts/base.html
-- _layouts/docs.html
-- _layouts/landing.html
+- _layouts/default.html
+- _layouts/home.html
+- _layouts/page.html
+- _layouts/post.html
 - _layouts/search-results.html
 - _sass/uswds/_all.scss
 - _sass/uswds/components/_accordions.scss
@@ -483,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A Jekyll theme for the U.S. Web Design Standards