Merge pull request #3367 from uswds/release-2.6.0

Release 2.6.0
uswds · Mar 18, 2020 · 91c56d4 · 91c56d4
2 parents fe40d6f + f5ed10a
commit 91c56d4
Show file tree

Hide file tree

Showing 76 changed files with 2,903 additions and 2,896 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -64,8 +64,6 @@ jobs:
           command: |
             npm config set "//registry.npmjs.org/:_authToken=$NPM_TOKEN"
             npm publish
-      - snyk/scan:
-          organization: uswds
 
 workflows:
   version: 2

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-12.13.0
+12.16.1
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+src/stylesheets/core/system-tokens/**/*
diff --git a/README.md b/README.md
@@ -62,12 +62,12 @@ How you implement the design system depends on the needs of your project and you
 
 ### Download
 
-1. Download the [USWDS zip file](https://github.com/uswds/uswds/releases/tag/v2.5.1) from the latest USWDS release and open that file.
+1. Download the [USWDS zip file](https://github.com/uswds/uswds/releases/tag/v2.6.0) from the latest USWDS release and open that file.
 
    After extracting the zip file you should see the following file and folder structure:
 
    ```
-   uswds-2.5.1/
+   uswds-2.6.0/
    ├── css/
    │   ├── uswds.min.css.map
    │   ├── uswds.min.css
@@ -87,7 +87,7 @@ How you implement the design system depends on the needs of your project and you
    ```
    example-project/
    ├── assets/
-   │   ├── uswds-2.5.1/
+   │   ├── uswds-2.6.0/
    │   ├── stylesheets/
    │   ├── images/
    │   └── javascript/
@@ -107,10 +107,10 @@ How you implement the design system depends on the needs of your project and you
        <meta charset="utf-8" />
        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <title>My Example Project</title>
-       <link rel="stylesheet" href="assets/uswds-2.5.1/css/uswds.min.css" />
+       <link rel="stylesheet" href="assets/uswds-2.6.0/css/uswds.min.css" />
      </head>
      <body>
-       <script src="assets/uswds-2.5.1/js/uswds.min.js"></script>
+       <script src="assets/uswds-2.6.0/js/uswds.min.js"></script>
      </body>
    </html>
    ```

diff --git a/docs/WHO_IS_USING_USWDS.md b/docs/WHO_IS_USING_USWDS.md
@@ -8,6 +8,7 @@ Below are a list of websites and applications currently using the U.S. Web Desig
 - [18F Before you ship](https://before-you-ship.18f.gov/)
 - [18F Front End Guide](https://frontend.18f.gov/)
 - [Accessibility for Teams](https://accessibility.digital.gov/)
+- [Advanced Distributed Learning (ADL) Initiative](https://adlnet.gov)
 - [Agricultural Marketing Service - USDA](http://gipsa.usda.gov/)
 - [Agricultural Research Service - USDA](https://www.ars.usda.gov/)
 - [America’s Seed Fund - National Science Foundation](https://seedfund.nsf.gov/)

diff --git a/gulpfile.js b/gulpfile.js
@@ -71,3 +71,9 @@ gulp.task("default", function(done) {
 
   done();
 });
+
+gulp.task("watch", function() {
+  gulp.watch("src/stylesheets/**/*.scss", gulp.series("sass")),
+    gulp.watch("src/js/**/*.js", gulp.series("javascript"));
+  return;
+});