Update to uswds 2.2.1 (#303)

* uswds update to 2.2.1

* update font and image paths

* use $theme-image-path variable

* uncomment change used for testing

* bug fix

* update theme settings

* revert to original setting

* update for theme

* bug fix

* remove comments used for testing

package.json

@@ -22,7 +22,7 @@
     "test-watch": "jest --watch",
     "update-data": "node update-data.js",
     "update-fonts": "cp -r ./node_modules/@code.gov/code-gov-style/assets/font/* ./assets/fonts/.",
-    "update-uswds": "cp -r ./node_modules/uswds/dist/* ./styles/uswds/.",
+    "update-uswds": "rm -r ./styles/uswds/* && cp -r ./node_modules/uswds/dist/* ./styles/uswds/.",
     "webpack": "node ./node_modules/webpack/bin/webpack.js"
   },
   "husky": {
@@ -98,7 +98,7 @@
     "sass": "^1.20.1",
     "snyk": "^1.210.0",
     "url-search-params-polyfill": "^5.1.0",
-    "uswds": "^2.1.0",
+    "uswds": "^2.2.1",
     "webpack": "^4.39.3",
     "webpack-bundle-analyzer": "^3.3.2",
     "webpack-cli": "^3.3.2",

styles/_main.scss

@@ -4,10 +4,8 @@
 @import '~@code.gov/code-gov-font/css/code-gov';
 /*@import '~devicons/css/devicons.scss';*/
 
-@import './styles/theme/styles.scss';
-
 $header-height: 50px;
-
+@import './styles/uswds/scss/theme/styles.scss';
 @import '~@code.gov/code-gov-style/_sass/_all.scss';
 
 @import './overrides.scss';