From 5e1dc53dcd078f6361baa6711c21980d390b8eba Mon Sep 17 00:00:00 2001 From: Heather Battaglia Date: Wed, 24 May 2017 17:07:01 -0600 Subject: [PATCH] move WDS to a vendor folder instead for easier updating --- README.md | 4 +- _config.yml | 2 +- _includes/head.html | 3 +- _includes/header.html | 8 +- _includes/javascript.html | 4 +- _sass/_banners.scss | 4 + assets/css/google-fonts.css | 102 - assets/css/usfwds.css | 2006 ----------------- assets/js/lib/jquery-1.11.3.min.js | 5 - assets/vendor/jquery-3.2.1.min.js | 4 + assets/vendor/uswds-1.1.0/CONTRIBUTING.md | 145 ++ assets/vendor/uswds-1.1.0/LICENSE.md | 63 + assets/vendor/uswds-1.1.0/README.md | 254 +++ .../uswds-1.1.0/css/uswds.css} | 0 .../fonts/merriweather-bold-webfont.eot | Bin 0 -> 30040 bytes .../fonts/merriweather-bold-webfont.ttf | Bin 0 -> 60116 bytes .../fonts/merriweather-bold-webfont.woff | Bin 0 -> 34148 bytes .../fonts/merriweather-bold-webfont.woff2 | Bin 0 -> 27028 bytes .../fonts/merriweather-italic-webfont.eot | Bin 0 -> 61196 bytes .../fonts/merriweather-italic-webfont.ttf | Bin 0 -> 61088 bytes .../fonts/merriweather-italic-webfont.woff | Bin 0 -> 32640 bytes .../fonts/merriweather-italic-webfont.woff2 | Bin 0 -> 25724 bytes .../fonts/merriweather-light-webfont.eot | Bin 0 -> 29810 bytes .../fonts/merriweather-light-webfont.ttf | Bin 0 -> 61376 bytes .../fonts/merriweather-light-webfont.woff | Bin 0 -> 33916 bytes .../fonts/merriweather-light-webfont.woff2 | Bin 0 -> 27036 bytes .../fonts/merriweather-regular-webfont.eot | Bin 0 -> 27962 bytes .../fonts/merriweather-regular-webfont.ttf | Bin 0 -> 60020 bytes .../fonts/merriweather-regular-webfont.woff | Bin 0 -> 32056 bytes .../fonts/merriweather-regular-webfont.woff2 | Bin 0 -> 25176 bytes .../fonts/sourcesanspro-bold-webfont.eot | Bin 0 -> 28017 bytes .../fonts/sourcesanspro-bold-webfont.ttf | Bin 0 -> 65244 bytes .../fonts/sourcesanspro-bold-webfont.woff | Bin 0 -> 29360 bytes .../fonts/sourcesanspro-bold-webfont.woff2 | Bin 0 -> 23368 bytes .../fonts/sourcesanspro-italic-webfont.eot | Bin 0 -> 20839 bytes .../fonts/sourcesanspro-italic-webfont.ttf | Bin 0 -> 44868 bytes .../fonts/sourcesanspro-italic-webfont.woff | Bin 0 -> 22260 bytes .../fonts/sourcesanspro-italic-webfont.woff2 | Bin 0 -> 17472 bytes .../fonts/sourcesanspro-light-webfont.eot | Bin 0 -> 28305 bytes .../fonts/sourcesanspro-light-webfont.ttf | Bin 0 -> 66008 bytes .../fonts/sourcesanspro-light-webfont.woff | Bin 0 -> 29668 bytes .../fonts/sourcesanspro-light-webfont.woff2 | Bin 0 -> 23608 bytes .../fonts/sourcesanspro-regular-webfont.eot | Bin 0 -> 28337 bytes .../fonts/sourcesanspro-regular-webfont.ttf | Bin 0 -> 65672 bytes .../fonts/sourcesanspro-regular-webfont.woff | Bin 0 -> 29724 bytes .../fonts/sourcesanspro-regular-webfont.woff2 | Bin 0 -> 23684 bytes .../uswds-1.1.0}/img/alerts/error.png | Bin .../uswds-1.1.0}/img/alerts/error.svg | 0 .../uswds-1.1.0}/img/alerts/info.png | Bin .../uswds-1.1.0}/img/alerts/info.svg | 0 .../uswds-1.1.0}/img/alerts/success.png | Bin .../uswds-1.1.0}/img/alerts/success.svg | 0 .../uswds-1.1.0}/img/alerts/warning.png | Bin .../uswds-1.1.0}/img/alerts/warning.svg | 0 .../img/angle-arrow-down-hover.png | Bin .../img/angle-arrow-down-hover.svg | 0 .../img/angle-arrow-down-primary-hover.png | Bin .../img/angle-arrow-down-primary-hover.svg | 0 .../img/angle-arrow-down-primary.png | Bin .../img/angle-arrow-down-primary.svg | 0 .../uswds-1.1.0}/img/angle-arrow-down.png | Bin .../uswds-1.1.0}/img/angle-arrow-down.svg | 0 .../img/angle-arrow-up-primary-hover.png | Bin .../img/angle-arrow-up-primary-hover.svg | 0 .../img/angle-arrow-up-primary.png | Bin .../img/angle-arrow-up-primary.svg | 0 .../uswds-1.1.0}/img/arrow-down.png | Bin .../uswds-1.1.0}/img/arrow-down.svg | 0 .../uswds-1.1.0}/img/arrow-right.png | Bin .../uswds-1.1.0}/img/arrow-right.svg | 0 .../uswds-1.1.0}/img/circle-124.png | Bin assets/{ => vendor/uswds-1.1.0}/img/close.png | Bin assets/{ => vendor/uswds-1.1.0}/img/close.svg | 0 .../{ => vendor/uswds-1.1.0}/img/correct8.png | Bin .../{ => vendor/uswds-1.1.0}/img/correct8.svg | 0 .../{ => vendor/uswds-1.1.0}/img/correct9.png | Bin .../{ => vendor/uswds-1.1.0}/img/correct9.svg | 0 .../img/external-link-alt-hover.png | Bin .../img/external-link-alt-hover.svg | 0 .../uswds-1.1.0}/img/external-link-alt.png | Bin .../uswds-1.1.0}/img/external-link-alt.svg | 0 .../uswds-1.1.0}/img/external-link-hover.png | Bin .../uswds-1.1.0}/img/external-link-hover.svg | 0 .../uswds-1.1.0}/img/external-link.png | Bin .../uswds-1.1.0}/img/external-link.svg | 0 .../uswds-1.1.0}/img/favicons/favicon-114.png | Bin .../uswds-1.1.0}/img/favicons/favicon-144.png | Bin .../uswds-1.1.0}/img/favicons/favicon-16.png | Bin .../uswds-1.1.0}/img/favicons/favicon-192.png | Bin .../uswds-1.1.0}/img/favicons/favicon-40.png | Bin .../uswds-1.1.0}/img/favicons/favicon-57.png | Bin .../uswds-1.1.0}/img/favicons/favicon-72.png | Bin .../uswds-1.1.0}/img/favicons/favicon.ico | Bin .../uswds-1.1.0}/img/favicons/favicon.png | Bin assets/{ => vendor/uswds-1.1.0}/img/hero.png | Bin .../uswds-1.1.0}/img/icon-dot-gov.svg | 0 .../uswds-1.1.0}/img/icon-https.svg | 0 .../{ => vendor/uswds-1.1.0}/img/logo-img.png | Bin .../uswds-1.1.0}/img/minus-alt.png | Bin .../uswds-1.1.0}/img/minus-alt.svg | 0 assets/{ => vendor/uswds-1.1.0}/img/minus.png | Bin assets/{ => vendor/uswds-1.1.0}/img/minus.svg | 0 .../{ => vendor/uswds-1.1.0}/img/plus-alt.png | Bin .../{ => vendor/uswds-1.1.0}/img/plus-alt.svg | 0 assets/{ => vendor/uswds-1.1.0}/img/plus.png | Bin assets/{ => vendor/uswds-1.1.0}/img/plus.svg | 0 .../uswds-1.1.0}/img/search-alt.png | Bin .../uswds-1.1.0}/img/search-alt.svg | 0 .../{ => vendor/uswds-1.1.0}/img/search.png | Bin .../{ => vendor/uswds-1.1.0}/img/search.svg | 0 .../img/social-icons/png/facebook25.png | Bin .../img/social-icons/png/rss25.png | Bin .../img/social-icons/png/twitter16.png | Bin .../img/social-icons/png/youtube15.png | Bin .../img/social-icons/svg/facebook25.svg | 0 .../img/social-icons/svg/rss25.svg | 0 .../img/social-icons/svg/twitter16.svg | 0 .../img/social-icons/svg/youtube15.svg | 0 .../uswds-1.1.0}/img/us_flag_small.png | Bin assets/vendor/uswds-1.1.0/js/uswds.js | 1445 ++++++++++++ .../uswds-1.1.0/js/uswds.min.js} | 0 assets/vendor/uswds-1.1.0/js/uswds.min.js.map | 1 + 122 files changed, 1926 insertions(+), 2124 deletions(-) delete mode 100644 assets/css/google-fonts.css delete mode 100644 assets/css/usfwds.css delete mode 100644 assets/js/lib/jquery-1.11.3.min.js create mode 100644 assets/vendor/jquery-3.2.1.min.js create mode 100644 assets/vendor/uswds-1.1.0/CONTRIBUTING.md create mode 100644 assets/vendor/uswds-1.1.0/LICENSE.md create mode 100644 assets/vendor/uswds-1.1.0/README.md rename assets/{css/uswds.v1.1.0.css => vendor/uswds-1.1.0/css/uswds.css} (100%) create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-bold-webfont.eot create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-bold-webfont.ttf create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-bold-webfont.woff create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-bold-webfont.woff2 create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-italic-webfont.eot create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-italic-webfont.ttf create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-italic-webfont.woff create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-italic-webfont.woff2 create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-light-webfont.eot create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-light-webfont.ttf create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-light-webfont.woff create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-light-webfont.woff2 create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-regular-webfont.eot create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-regular-webfont.ttf create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-regular-webfont.woff create mode 100755 assets/vendor/uswds-1.1.0/fonts/merriweather-regular-webfont.woff2 create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-bold-webfont.eot create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-bold-webfont.ttf create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-bold-webfont.woff create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-bold-webfont.woff2 create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-italic-webfont.eot create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-italic-webfont.ttf create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-italic-webfont.woff create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-italic-webfont.woff2 create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-light-webfont.eot create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-light-webfont.ttf create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-light-webfont.woff create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-light-webfont.woff2 create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-regular-webfont.eot create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-regular-webfont.ttf create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-regular-webfont.woff create mode 100644 assets/vendor/uswds-1.1.0/fonts/sourcesanspro-regular-webfont.woff2 rename assets/{ => vendor/uswds-1.1.0}/img/alerts/error.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/alerts/error.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/alerts/info.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/alerts/info.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/alerts/success.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/alerts/success.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/alerts/warning.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/alerts/warning.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-down-hover.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-down-hover.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-down-primary-hover.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-down-primary-hover.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-down-primary.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-down-primary.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-down.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-down.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-up-primary-hover.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-up-primary-hover.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-up-primary.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/angle-arrow-up-primary.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/arrow-down.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/arrow-down.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/arrow-right.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/arrow-right.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/circle-124.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/close.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/close.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/correct8.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/correct8.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/correct9.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/correct9.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/external-link-alt-hover.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/external-link-alt-hover.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/external-link-alt.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/external-link-alt.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/external-link-hover.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/external-link-hover.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/external-link.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/external-link.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon-114.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon-144.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon-16.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon-192.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon-40.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon-57.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon-72.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon.ico (100%) rename assets/{ => vendor/uswds-1.1.0}/img/favicons/favicon.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/hero.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/icon-dot-gov.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/icon-https.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/logo-img.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/minus-alt.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/minus-alt.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/minus.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/minus.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/plus-alt.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/plus-alt.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/plus.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/plus.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/search-alt.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/search-alt.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/search.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/search.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/social-icons/png/facebook25.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/social-icons/png/rss25.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/social-icons/png/twitter16.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/social-icons/png/youtube15.png (100%) rename assets/{ => vendor/uswds-1.1.0}/img/social-icons/svg/facebook25.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/social-icons/svg/rss25.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/social-icons/svg/twitter16.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/social-icons/svg/youtube15.svg (100%) rename assets/{ => vendor/uswds-1.1.0}/img/us_flag_small.png (100%) create mode 100644 assets/vendor/uswds-1.1.0/js/uswds.js rename assets/{js/lib/uswds.v1.1.0.min.js => vendor/uswds-1.1.0/js/uswds.min.js} (100%) create mode 100644 assets/vendor/uswds-1.1.0/js/uswds.min.js.map diff --git a/README.md b/README.md index f624a2c..64ce974 100644 --- a/README.md +++ b/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 diff --git a/_config.yml b/_config.yml index 97384c9..399212e 100644 --- a/_config.yml +++ b/_config.yml @@ -102,4 +102,4 @@ collections: team: output: true -wds_version: 1.1.0 +wds-version: 1.1.0 diff --git a/_includes/head.html b/_includes/head.html index a8ab404..6f9b77c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -16,8 +16,7 @@ - - + diff --git a/_includes/header.html b/_includes/header.html index c92660b..3b045bd 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -6,7 +6,7 @@
- U.S. flag + U.S. flag

An official website of the United States government

- Dot gov + Dot gov

The .gov means it’s official. @@ -26,7 +26,7 @@

- SSL + SSL

This site is also protected by an SSL (Secure Sockets Layer) certificate that’s been signed by the U.S. government. The https:// means all transmitted data is encrypted — in other words, any information or browsing history that you provide is transmitted securely.

@@ -53,7 +53,7 @@

{{ site.title }}