Skip to content
Merged
Changes from 5 commits
Commits
Show all changes
328 commits
Select commit Hold shift + click to select a range
5b305ff
install al-ld-remove-compare branch
Mar 29, 2022
bb17116
update readme and reference to build:html command
Mar 29, 2022
5ab331d
Merge branch 'main' of https://github.com/uswds/uswds-site into al-re…
Mar 29, 2022
62f58be
update packages/uswds-core references
Mar 29, 2022
14bf301
temporarily update library_component references to usa-usa-
Mar 29, 2022
964aecd
incorporate jm-test-core
Mar 29, 2022
b0688c3
update gulp src location to dist
Mar 30, 2022
eb1c037
update compare markup for card and sidenav
Mar 30, 2022
d84185b
remove references to @uswds
Mar 30, 2022
8f53c09
Merge branch 'main' of https://github.com/uswds/uswds-site into al-be…
Mar 30, 2022
747e890
run prettier
Mar 30, 2022
60217ac
Delete pull main
amyleadem Mar 30, 2022
49477c7
add blue close icon svg
Mar 30, 2022
8aff4e1
update package-lock.json
Mar 30, 2022
275d454
update references to remove usa-usa
Mar 31, 2022
5b83ea7
update package.json
Mar 31, 2022
76f5e9c
add alert~info variant
Mar 31, 2022
c0f9eb3
update table component include to show multiple stories
Apr 4, 2022
94a1286
remove erroneous </h6> tag
Apr 5, 2022
faaaa2b
update styles for nav searchbar
Apr 5, 2022
34f0085
update readme
Apr 6, 2022
3aebb75
merge updates in main
Apr 6, 2022
1d8a515
remove test sr-only styles
Apr 6, 2022
8620f45
Update instructions in comment for config/gulp/build.js
amyleadem Apr 7, 2022
d36bb03
update templates preview demo links
Apr 8, 2022
b38742e
update documentation template preview demo link
Apr 8, 2022
23e0a0d
update header demo link references
Apr 8, 2022
39c8960
add tag--big variant
Apr 8, 2022
1c679d0
remove comment in build.js
Apr 8, 2022
58befe7
remove skipnav and banner from header component code
Apr 8, 2022
868e7ed
remove unused icon-sizes.html
Apr 8, 2022
0b35e70
update default tag header name
Apr 8, 2022
a484108
Rename dropdown component to select
Apr 8, 2022
d655501
move table example container styles to custom-styles.scss
Apr 8, 2022
a35b9c7
move table example container styles to custom-styles.scss
Apr 8, 2022
256b4d0
update package-lock
Apr 8, 2022
15ec8f2
3.0 changes needed from Devs_Download code
mikki-stacey Apr 11, 2022
d563e02
3.0 changes needed from Devs_How to use UsWDS
mikki-stacey Apr 11, 2022
2e0b437
Removal of IE11_Getting started for devs
mikki-stacey Apr 11, 2022
d69550b
Update overview.md
mikki-stacey Apr 11, 2022
1084c47
update nav close icon markup
Apr 11, 2022
d5cabfb
code prettying
Apr 11, 2022
494c14d
merge updates from main
Apr 12, 2022
56cbfaa
Update phase-two.md
bonnieAcameron Apr 12, 2022
0fc1ee2
Update website-policies-and-notices.md
bonnieAcameron Apr 12, 2022
8c8430c
Update overview.md
bonnieAcameron Apr 12, 2022
8e0da01
Update packages.md
bonnieAcameron Apr 12, 2022
0448eb7
update package-lock
Apr 12, 2022
0e3c878
merge updates from main
Apr 13, 2022
56531bd
update package-lock to fix sign-in form issue
Apr 15, 2022
c88e953
update uswds branch to library--develop
Apr 15, 2022
efc8062
Merge pull request #1526 from uswds/main
thisisdano Apr 15, 2022
1d7a82c
Merge branch 'develop' of https://github.com/uswds/uswds-site into al…
Apr 15, 2022
1e4bbf3
rename date-input to memorable-date
Apr 15, 2022
fbcc46f
Update bundler and package-lock
mejiaj Apr 15, 2022
a7f0269
Update component preview branch
mejiaj Apr 15, 2022
dffdd21
Uses latest library--develop and leaner docker image
mejiaj Apr 15, 2022
80902a6
Use browsers to get pa11y ci deps
mejiaj Apr 15, 2022
ca4312d
Merge pull request #1493 from uswds/al-beta-integration
thisisdano Apr 15, 2022
ac39b37
Merge pull request #1527 from uswds/jm-beta-build-test
thisisdano Apr 15, 2022
020d503
Spec packages data
thisisdano Apr 17, 2022
dce5013
Add package data
thisisdano Apr 17, 2022
8571942
Add package table
thisisdano Apr 17, 2022
8bb186e
Test package table on packages page
thisisdano Apr 17, 2022
ba7d311
Reformat package names
thisisdano Apr 17, 2022
ec034ea
Add utility module data
thisisdano Apr 17, 2022
241d26b
Add utilities module data to settings page
thisisdano Apr 17, 2022
90203dc
Use proper utilities settings file
thisisdano Apr 17, 2022
8be8915
Reduce space between Utility module hed and table
thisisdano Apr 17, 2022
c4c086d
Use a clearer column name for class base
thisisdano Apr 17, 2022
9f8e5df
Update utilites page with updated module and package info
thisisdano Apr 18, 2022
55f76b4
Improve copy
thisisdano Apr 18, 2022
3c3e35a
Renamed migration to migration-V2
mahoneycm Apr 18, 2022
0e53efd
Added USWDS 3.0 migration page
mahoneycm Apr 18, 2022
59cbd02
Updated nav to include both migration pages (version 2 and 3)
mahoneycm Apr 18, 2022
f8ec792
Updated link to USWDS 2 migration guide on the maturity model page
mahoneycm Apr 18, 2022
f01d177
Merge branch 'develop' of github.com:uswds/uswds-site into cm-migrate…
mahoneycm Apr 18, 2022
c57a493
update uswds_version to 3.0
Apr 18, 2022
6236262
merge updates from develop
Apr 18, 2022
c6974f5
Merge branch 'develop' of https://github.com/uswds/uswds-site into v3…
Apr 18, 2022
ab4d6f3
Merge pull request #1537 from uswds/al-v3-header-button
amyleadem Apr 18, 2022
5326371
Finished migrating text to page and switched html tags to markdown sy…
mahoneycm Apr 18, 2022
0ff1416
Update site version reference to 3.0.0
thisisdano Apr 18, 2022
198834e
Add a 3.0 banner (link needs updating)
thisisdano Apr 18, 2022
b0ed15f
use proper fonts package in package dependencies
thisisdano Apr 19, 2022
803c312
Rewrite packages page
thisisdano Apr 19, 2022
953545a
Update package page
thisisdano Apr 19, 2022
7c91d1b
Use package data in component package section
thisisdano Apr 19, 2022
ab9a57c
Update package names in components
thisisdano Apr 19, 2022
c8205f2
Use @uswds/uswds package and update scripts
thisisdano Apr 19, 2022
dacdd19
Update copy scripts to copy from proper directory
thisisdano Apr 19, 2022
03ca8ac
Add space after dependencies hed
thisisdano Apr 19, 2022
f8221de
FIx packages sidenav
thisisdano Apr 19, 2022
cef22d6
Use exact version
thisisdano Apr 19, 2022
a00f71e
Removed aria-expanded=true from accordion sections so they load colla…
mahoneycm Apr 19, 2022
e2afb89
removed <br> from <ol> that was causing accessibility error
mahoneycm Apr 19, 2022
79a56a6
Removed all highlighting on text
mahoneycm Apr 19, 2022
62197b4
Remove <hr>'s from old/new code blocks
mahoneycm Apr 19, 2022
6df148e
Fixed step 4 accordion formatting
mahoneycm Apr 19, 2022
66a8514
Merge pull request #1528 from uswds/dw-settings-packages
thisisdano Apr 19, 2022
a8be6f8
Merge branch 'develop' into v3-content-updates
thisisdano Apr 19, 2022
db7fd99
Merge branch 'develop' into cm-migrate-3.0
thisisdano Apr 19, 2022
9010a82
Use /migration for new migration guide and /migration/uswds-2 for old…
thisisdano Apr 19, 2022
0a470fc
Updated headers and navigation
mahoneycm Apr 19, 2022
84994d1
Merge branch 'cm-migrate-3.0' of github.com:uswds/uswds-site into cm-…
mahoneycm Apr 19, 2022
d741392
Bulk of post migration
mahoneycm Apr 19, 2022
f2c7c66
Update post meta data + name
mahoneycm Apr 19, 2022
d1acf0d
Fixed links and removed Maya as author
mahoneycm Apr 19, 2022
bf9ecd7
Copyedits and style changes to migration guide
thisisdano Apr 19, 2022
8ad2163
Update 2.0 page name
thisisdano Apr 19, 2022
ef79d16
Nested code block revision
mahoneycm Apr 19, 2022
d0c2c29
Continued code block revision
mahoneycm Apr 19, 2022
0d53afb
Finish code block revision + removes unnecessary {% raw %} tags
mahoneycm Apr 19, 2022
7942bc2
Updated USWDS 3.0 + 2.0 nav link text
mahoneycm Apr 19, 2022
f77aab9
Added Recommended and Optional tags to relevant titles
mahoneycm Apr 19, 2022
1ce96f2
Add formatting for site-prose h6
thisisdano Apr 19, 2022
398d9b5
Use markdown for accordion content
thisisdano Apr 19, 2022
0fe6a6e
Continue using markdown for accordion content
thisisdano Apr 19, 2022
45edfe9
Revert markdown sections (not working)
thisisdano Apr 19, 2022
85f21f7
Use new url for v2 migration doc
thisisdano Apr 19, 2022
c9aaad2
Use site.baseurl in link
thisisdano Apr 19, 2022
90b0073
Try using a different url for v2 migration guide
thisisdano Apr 19, 2022
af25694
Update 2.11.2 migration info
thisisdano Apr 19, 2022
4452e2a
Fixed conversion table link on maturity model page
mahoneycm Apr 20, 2022
55d4736
Merge branch 'cm-migrate-3.0' of github.com:uswds/uswds-site into cm-…
thisisdano Apr 20, 2022
4d489be
Update pages/documentation/migration-V2.md
mahoneycm Apr 20, 2022
a80e870
Merge branch 'cm-migrate-3.0' of github.com:uswds/uswds-site into cm-…
thisisdano Apr 20, 2022
0c37d16
Revert "Merge branch 'cm-migrate-3.0' of github.com:uswds/uswds-site …
thisisdano Apr 20, 2022
6a3e00e
Update _data/nav.yml
mahoneycm Apr 21, 2022
024ff52
convert accordion html to markup
Apr 21, 2022
8f98591
Continue html to markdown conversion
mahoneycm Apr 22, 2022
ef0d34f
Delete unnecessary text
mahoneycm Apr 22, 2022
8cd6351
Merge branch 'cm-migrate-3.0' of github.com:uswds/uswds-site into cm-…
mahoneycm Apr 22, 2022
a2b5998
Merge branch 'cm-migrate-3.0' of github.com:uswds/uswds-site into al-…
mahoneycm Apr 22, 2022
298fa0e
Merge pull request #1543 from uswds/al-migrate-3.0
mahoneycm Apr 22, 2022
86c766e
Replaced bolded code references with code snippets
mahoneycm Apr 22, 2022
1423ff2
Removed unnecessary arrow icons for external links
mahoneycm Apr 22, 2022
87b9d78
Fix heading level nested within step 6
mahoneycm Apr 22, 2022
3097256
Update heds and indents
thisisdano Apr 25, 2022
9d3f271
Corrected step three save-exact command
mahoneycm Apr 25, 2022
3e30bb9
Show touchpoints only when site key is set (set to: false)
thisisdano Apr 25, 2022
2f916b3
Update getting started phase one page
mahoneycm Apr 25, 2022
ecd8192
Update node_module path
mahoneycm Apr 25, 2022
d14ab31
Updated path settings table with v3 settings
mahoneycm Apr 25, 2022
6fa3cd7
Update OMB Memo M-17-06 links
mahoneycm Apr 25, 2022
c07460e
Update Touchpoints delivery to remove script requirement
Apr 25, 2022
4be4e96
Merge pull request #1550 from uswds/dw-touchpoints-switch
thisisdano Apr 25, 2022
0856a52
Merge branch 'develop' into cm-migrate-3.0
thisisdano Apr 25, 2022
cde58ad
Use setting names instead of file names
thisisdano Apr 25, 2022
40fd4bf
Merge branch 'develop' into al-hosted-touchpoints
thisisdano Apr 25, 2022
84b9b5f
Use two touchpoints keys to control output
thisisdano Apr 25, 2022
aa7f81c
Merge pull request #1551 from uswds/al-hosted-touchpoints
thisisdano Apr 25, 2022
458598d
Update USWDS Compile instructions
thisisdano Apr 25, 2022
ca7ba2b
Update custom gulp instructions
thisisdano Apr 25, 2022
e2c8000
update touchpoints href to live survey
Apr 25, 2022
e479de8
Use diff highlighting [markdown broken]
thisisdano Apr 25, 2022
f1e3204
Merge branch 'cm-migrate-3.0' of github.com:uswds/uswds-site into cm-…
thisisdano Apr 25, 2022
df23645
merge updates from develop
Apr 26, 2022
9c58c5d
Merge branch 'develop' of https://github.com/uswds/uswds-site into cm…
Apr 26, 2022
a9481bb
run prettier
Apr 26, 2022
6cb1ea7
wrap prettier npm command with single quote
Apr 26, 2022
45b264e
Merge pull request #1553 from uswds/al-prettier
Apr 26, 2022
66ecdd2
Merge pull request #1552 from uswds/al-update-touchpoints
thisisdano Apr 26, 2022
66cb443
Formatting path setting table
mahoneycm Apr 26, 2022
8299ada
Remove snyk protect from package.json
mejiaj Apr 26, 2022
afe925c
Update to Snyk 1.913.0
mejiaj Apr 26, 2022
18f0f2f
Reorg sections
thisisdano Apr 26, 2022
be2b952
Update sidenav
thisisdano Apr 26, 2022
74ac55d
Update Load Paths guidance to use html
thisisdano Apr 26, 2022
32345cc
Moar copy updates, including reorg to Sass Modules section
thisisdano Apr 26, 2022
82a7b25
Update $ouput-these-utilities section
thisisdano Apr 26, 2022
5db5368
Merge pull request #1529 from uswds/cm-migrate-3.0
thisisdano Apr 27, 2022
b0c9ba4
Merge pull request #1555 from uswds/jm-develop-remove-snyk-protect
thisisdano Apr 27, 2022
83ec411
Copyedits
thisisdano Apr 27, 2022
288a7b3
Merge branch 'develop' into v3-content-updates
thisisdano Apr 27, 2022
b1e73c6
Merge branch 'develop' into cm-3.0-post
thisisdano Apr 27, 2022
78cbfc2
Update homepage 3.0 button
thisisdano Apr 27, 2022
79418b9
Update excerpt
thisisdano Apr 27, 2022
2682c2e
Merge pull request #1530 from uswds/v3-content-updates
thisisdano Apr 27, 2022
568876e
Merge branch 'develop' into cm-3.0-post
thisisdano Apr 27, 2022
3a6d20f
Pull from library--develop for data
thisisdano Apr 27, 2022
c205a12
Update intro
thisisdano Apr 27, 2022
8ef8ab2
Update home buttons
thisisdano Apr 27, 2022
183d827
Add temp image and update post date
thisisdano Apr 27, 2022
7fb0f99
Fix typo in `$theme-table-stripe-text-color`
mejiaj Apr 27, 2022
d5ad949
Remove end of line whitespace
mejiaj Apr 27, 2022
e2eaabd
Step 1: remove extra `a` before version 2.13.3
mejiaj Apr 27, 2022
c517bc0
Use lowercase `u` in _If you use it, Update the markup_
mejiaj Apr 27, 2022
f492d15
Fix footer social icon paths
mejiaj Apr 27, 2022
85c2ba9
Fix indents in diff to get highlighting
mejiaj Apr 27, 2022
aeb366d
Fix breakpoint name in _Reduce utility responsive breakpoints_
mejiaj Apr 27, 2022
3d43132
Update migration-V3.md
thisisdano Apr 27, 2022
925c5d7
Merge pull request #1539 from uswds/cm-3.0-post
thisisdano Apr 27, 2022
c4a740a
update site-terminal, fix capitalization, update uswds-core instructions
Apr 27, 2022
691d825
Merge pull request #1557 from uswds/jm-migration-3-edits
thisisdano Apr 27, 2022
e83cfce
Merge pull request #1549 from uswds/cm-omb-links
thisisdano Apr 27, 2022
29dbe5a
additional tweaks to the uswds-core section
Apr 27, 2022
7e79328
refine packages section; update intro to optimization section
Apr 27, 2022
206cae1
fine tune copy
Apr 27, 2022
7642cee
merge updates from develop
Apr 27, 2022
9a07ac3
more copy fine-tuning
Apr 27, 2022
337ab20
small copy edits
Apr 27, 2022
bce4cd5
Fix misc typos
Apr 27, 2022
6a82242
More copyedits throughout
Apr 27, 2022
5c62a2f
Repair typos and missing links
Apr 27, 2022
fad653b
Repair small typos
Apr 27, 2022
d8878fa
Merge updates from develop
Apr 27, 2022
36b16fb
Merge pull request #1558 from uswds/al-migration-updates
thisisdano Apr 27, 2022
b05e3d4
remove root includepath, update load paths intro
Apr 27, 2022
9caf419
update uswds_version to 3.0.0
Apr 27, 2022
9aab388
Merge pull request #1560 from uswds/al-packages-updates
thisisdano Apr 27, 2022
9557840
repair formatting for uswds entry point
Apr 27, 2022
769f8c3
update link urls
Apr 27, 2022
3f38a45
Remove Sass from requirements
thisisdano Apr 27, 2022
f1da40c
Update to USWDS 3.0 style and syntax
thisisdano Apr 28, 2022
126393b
Merge pull request #1548 from uswds/cm-3.0-dev-start
thisisdano Apr 28, 2022
a49f66b
Update installation links
thisisdano Apr 28, 2022
2211067
Fix TK link
thisisdano Apr 28, 2022
4e564c7
Merge branch 'develop' into al-intro-edits
thisisdano Apr 28, 2022
a58ae0d
Merge pull request #1561 from uswds/al-intro-edits
thisisdano Apr 28, 2022
186a2bb
Add version number and fix excerpt
thisisdano Apr 28, 2022
63acaf8
Add co-authors
thisisdano Apr 28, 2022
a639e22
Update 3.0 Intro image
thisisdano Apr 28, 2022
9d0e406
Image tidy
thisisdano Apr 28, 2022
0241c00
Second image tidy
thisisdano Apr 28, 2022
bc868f7
Use lowercase modules in Sass modules
thisisdano Apr 28, 2022
f447472
More image tweaks
thisisdano Apr 28, 2022
63cc3ae
Image tweaks
thisisdano Apr 28, 2022
74e87b9
Image tweak
thisisdano Apr 28, 2022
57f66af
Use develop for previews and readme
thisisdano Apr 28, 2022
c604fc1
Add Charlie to authors list
thisisdano Apr 28, 2022
d618218
Use sass module syntax and USWDS 3.0 conventions throughout
thisisdano Apr 28, 2022
297c261
Repair icons in mobile nav
Apr 28, 2022
c2fa52f
Update link to migration guide in 3.0 intro post
Apr 28, 2022
fa52cb9
Update accordion snippet on migration 3.0 guide
Apr 28, 2022
32f8d79
Update Sass module link
thisisdano Apr 28, 2022
7d10cc0
Update code snippets on packages page
Apr 28, 2022
7654086
Merge pull request #1567 from uswds/al-intro-post-edits
thisisdano Apr 28, 2022
7712b1f
Merge pull request #1565 from uswds/al-nav-icon-fix
thisisdano Apr 28, 2022
573e131
add uswds-core to packages.yml
Apr 28, 2022
a266893
Use proper `theme` directory
thisisdano Apr 28, 2022
fc0b0d3
Merge pull request #1569 from uswds/al-packages-copyedits
thisisdano Apr 28, 2022
11dcfe5
Merge pull request #1564 from uswds/dw-settings-page
thisisdano Apr 28, 2022
e5cab2b
Grammar fix
thisisdano Apr 28, 2022
07457f5
Use USWDS 3.0.0
thisisdano Apr 28, 2022
32bd43c
Update node_modules path in uswds gulp; remove redundant copy
Apr 28, 2022
6a2a0e8
Merge branch 'al-migration-edits' of https://github.com/uswds/uswds-s…
Apr 28, 2022
5bf9016
remove usa-icon dependency from usa-banner
Apr 28, 2022
5df04a9
Merge pull request #1570 from uswds/use-3.0.0
Apr 28, 2022
e10e348
Merge pull request #1568 from uswds/al-migration-edits
thisisdano Apr 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions pages/documentation/migration-V3.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,14 @@ Most of the source code now lives in `/@uswds/uswds/packages` but some compiled
An individual package looks like this:

```
├── packages/
│ ...
│ ├── usa-accordion/
│ │ ├── src/
│ │ │ ├── content/
│ │ │ │ ├── index.js
│ │ │ │ ├── usa-accordion.json
│ │ │ │ ├── usa-accordion~bordered.json
│ │ │ │ ├── usa-accordion~multiselectable.json
│ │ │ ├── styles/
│ │ │ │ ├── _index.scss
│ │ │ │ └── accordion.scss
Expand All @@ -81,7 +84,7 @@ An individual package looks like this:
│ │ │ ├── index.js
│ │ │ ├── usa-accordion.stories.js
│ │ │ └── usa-accordion.twig
│ │ └── _index.scss_/
│ │ └── _index.scss
```

Most teams won't ever need to know what's happening inside the USWDS source code, but the more you know about what's going on under the hood, the better you can understand what's happening and why as you migrate to USWDS 3.0.
Expand All @@ -105,7 +108,7 @@ There are four necessary steps migrating to USWDS 3.0. In addition to the requir
### 1. Check your current USWDS code and settings versions

{:.border-top-2px.border-base-lighter.padding-top-1}
USWDS 3.0 uses the same styles and markup as USWDS 2.13.3 — and, with one exception, the same settings. This means that if you're currently using USWDS 2.13.3, there's no styles and markup to update. But if you're using a version older than 2.13.3, migrating to USWDS 3.0 may mean updating some of your markup and settings.
USWDS 3.0 uses the same styles and markup as USWDS 2.13.3 — and, with one exception, the same settings. This means that if you're currently using USWDS 2.13.3, there are no styles or markup to update. But if you're using a version older than 2.13.3, migrating to USWDS 3.0 may mean updating some of your markup and settings.

So, before migrating, check the versions of both your existing USWDS code and its settings (since code and settings may be different).

Expand Down Expand Up @@ -182,7 +185,7 @@ Add this load path to your compiler settings, or update any old paths if your co
- const pkg = require("./node_modules/uswds/package.json");
+ const pkg = require("./node_modules/@uswds/uswds/package.json");
...
- const uswds = require("./node_modules/uswds/package.json");
- const uswds = require("./node_modules/uswds-gulp/config/uswds");
+ const uswds = "node_modules/@uswds/uswds";
or
- const USWDS = "node_modules/uswds/dist";
Expand Down Expand Up @@ -599,7 +602,7 @@ These instructions will help you update your `@import` references to the new syn

#### Update your @import references

1. **Replace all instances of @import with @forward in your Sass entry point.** Update all of the `@import` references in your Sass entry point to `@forward`.
1. **Replace all instances of @import with @forward in your Sass entry point.**

```diff
- @import "uswds-theme-color";
Expand Down Expand Up @@ -951,7 +954,6 @@ Instead of simply forwarding the `usa-banner` component, you can import the comp

// Import the component and all related dependencies
@forward "usa-banner";
@forward "usa-icon";
@forward "usa-layout-grid";
@forward "usa-media-block";
@forward "uswds-fonts";
Expand All @@ -961,7 +963,6 @@ Now, instead of pointing at the component packages, we can point directly at the

```scss
@forward "usa-banner/src/styles";
@forward "usa-icon/src/styles";
@forward "usa-layout-grid/src/styles";
@forward "usa-media-block/src/styles";
@forward "uswds-fonts";
Expand Down