move WDS to a vendor folder instead for easier updating

README.md

@@ -4,9 +4,9 @@ This is a Jekyll site. It is a simple site to showcase the work of an organizati
 
 This particular site is made for use with the [Federalist](https://github.com/18f/federalist) in mind.
 
-This template uses the CSS and JavaScript from [U.S. Web Design System](https://standards.18f.gov). To update the version of the system, [download the code](https://standards.usa.gov/getting-started/download/), then copy the CSS file to `assets/css/`. The file must include the version number, like this: `uswds.v1.1.0.css`. Copy the minified JavaScript file to `assets/js/lib/`. Again, rename the file to use the version number, so it looks like: `uswds.v1.1.0.min.js`.
+This template uses the CSS and JavaScript from [U.S. Web Design System](https://standards.18f.gov). To update the version of the system, [download the code](https://standards.usa.gov/getting-started/download/) from the website. Unzip the download and drop the entire folder (which should be named something like `uswds-1.1.0`) into `assets/vendor`.
 
-In your `_config.yml`, update the `wds_version` value to the new version number. This should match the number following the `v` in the filenames you just created. In the case of our example, it would look like this: `wds_version: 1.1.0`. You'll need to restart your Jekyll server to see the new code take effect.
+In your `_config.yml`, update the `wds-version` value to the new version number. This should match the version number in the name of the folder you just downloaded. In the case of our example, it would look like this: `wds-version: 1.1.0`. You'll need to restart your Jekyll server to see the new code take effect.
 
 ## 18F Open Source Policy
 

_config.yml

@@ -102,4 +102,4 @@ collections:
   team:
     output: true
 
-wds_version: 1.1.0
+wds-version: 1.1.0

_includes/head.html

@@ -16,8 +16,7 @@
   <meta property="og:description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
   <meta name="twitter:description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-  <link rel="stylesheet" href="{{ '/assets/css/google-fonts.css' | prepend: site.baseurl }}">
-  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/uswds.v{{site.wds_version}}.css">
+  <link rel="stylesheet" href="{{ site.baseurl }}/assets/vendor/uswds-{{site.wds-version}}/css/uswds.css">
   <link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl }}">
 
   <link rel="shortcut icon" type="image/x-icon" href="{{ '/assets/img/favicon.ico' | prepend: site.baseurl }}" />

_includes/header.html

@@ -6,7 +6,7 @@
     <div class="usa-accordion">
       <header class="usa-banner-header">
         <div class="usa-grid usa-banner-inner">
-        <img src="{{ site.baseurl }}/assets/img/us_flag_small.png" alt="U.S. flag">
+        <img src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/img/us_flag_small.png" alt="U.S. flag">
         <p>An official website of the United States government</p>
         <button class="usa-accordion-button usa-banner-button"
           aria-expanded="false" aria-controls="gov-banner">
@@ -16,7 +16,7 @@
       </header>
       <div class="usa-banner-content usa-grid usa-accordion-content" id="gov-banner">
         <div class="usa-banner-guidance-gov usa-width-one-half">
-          <img class="usa-banner-icon usa-media_block-img" src="{{ site.baseurl }}/assets/img/icon-dot-gov.svg" alt="Dot gov">
+          <img class="usa-banner-icon usa-media_block-img" src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/img/icon-dot-gov.svg" alt="Dot gov">
           <div class="usa-media_block-body">
             <p>
               <strong>The .gov means it’s official.</strong>
@@ -26,7 +26,7 @@
           </div>
         </div>
         <div class="usa-banner-guidance-ssl usa-width-one-half">
-          <img class="usa-banner-icon usa-media_block-img" src="{{ site.baseurl }}/assets/img/icon-https.svg" alt="SSL">
+          <img class="usa-banner-icon usa-media_block-img" src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/img/icon-https.svg" alt="SSL">
           <div class="usa-media_block-body">
             <p>This site is also protected by an SSL (Secure Sockets Layer) certificate that’s been signed by the U.S. government. The <strong>https://</strong> means all transmitted data is encrypted  — in other words, any information or browsing history that you provide is transmitted securely.</p>
           </div>
@@ -53,7 +53,7 @@ <h1 class="usa-header-title">{{ site.title }}</h1>
     </div>
     <nav role="navigation" class="usa-nav">
       <button class="usa-nav-close">
-        <img src="/assets/img/close.svg" alt="close">
+        <img src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/img/close.svg" alt="close">
       </button>
       <ul class="usa-nav-primary usa-accordion">
       {% assign navs = site.data.navbar.assigned %}

_includes/javascript.html

@@ -1,5 +1,5 @@
-<script src="{{ '/assets/js/lib/jquery-1.11.3.min.js' | prepend: site.baseurl  }}"></script>
-<script src="{{ site.baseurl }}/assets/js/lib/uswds.v{{ site.wds_version }}.min.js"></script>
+<script src="{{ site.baseurl }}/assets/vendor/jquery-3.2.1.min.js"></script>
+<script src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/js/uswds.min.js"></script>
 <script src="{{ '/assets/js/index.js' | prepend: site.baseurl  }}"></script>
 
 <!--

_sass/_banners.scss

@@ -1,3 +1,7 @@
+.usa-banner-header .usa-banner-inner > img {
+  padding-top: 3px;
+}
+
 .banner.tagline {
   background-color: $banner-background-color;
 }