Skip to content

Commit

Permalink
Merge branch 'main' into allison0034-patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
allison0034 authored Dec 3, 2024
2 parents ee4b29c + cc01fd5 commit b713185
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/_components/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ v3-based versions of the components are designed to sit alongside our current v1

* Do not mix and match different versions (v1 vs. v3) of the same component on the same page. For example, if you were to use the v3-based version of the [accordion component]({{ site.baseurl }}/components/accordion) on a page, that version must be used throughout that page (and ideally throughout your application as soon as possible).
* Do not mix and match v1 and v3 based [form components]({{ site.baseurl }}/components/form/) in the same application flow. For example, if you were to use the v3-based version of the radio button component on the first step in an application, that version must be used on all subsequent steps throughout the flow.
* Most examples of design system components can be found in Storybook. If your team is using any component outside of the design system web components, that is considered an imposter component and will be listed as a violation at your Staging Review. This includes components that are coded to look and function like design system web components, but do not use the design system code.
* Most examples of design system components can be found in [Storybook](https://design.va.gov/storybook). If your team is using any component outside of the [design system web components](https://github.com/department-of-veterans-affairs/component-library), that is considered an imposter component and will be listed as a violation at your Staging Review. This includes components that are coded to look and function like design system web components, but do not use the design system code.

{% include components-patterns-templates.md %}

Expand Down
12 changes: 3 additions & 9 deletions src/_content-style-guide/00_word-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -829,17 +829,11 @@ For terms that are not on this list, refer to [Merriam-Webster](https://www.merr
**Veterans Pension**
: "Veterans" doesn't take an apostrophe. Lowercase "pension" when writing "VA pension."

**Veterans Service Officer (VSO)**
: "Veterans" is plural and doesn't take an apostrophe. Go to [Abbreviations and acronyms]({{ site.baseurl }}/content-style-guide/abbreviations-and-acronyms) for guidance on using abbreviations on VA.gov.

**Veterans Service Organization (VSO)**
: "Veterans" is plural and doesn't take an apostrophe. Go to [Abbreviations and acronyms](https://design.va.gov/content-style-guide/abbreviations-and-acronyms) for guidance on using abbreviations on VA.gov.

**Veterans Service Representative (VSR)**
: “Veterans” is plural and doesn't take an apostrophe. Go to [Abbreviations and acronyms](https://design.va.gov/content-style-guide/abbreviations-and-acronyms) for guidance on using abbreviations on VA.gov.
: "Veterans" is plural and doesn't take an apostrophe. Don't use VSO to reference a Veterans Service Officer. Instead use Veterans Service Organization representative. Or VSO representatitve. Go to [Abbreviations and acronyms](https://design.va.gov/content-style-guide/abbreviations-and-acronyms) for guidance on using abbreviations on VA.gov.

**Vietnam Era: Capitalize**
: But lowercase "era" when you include "War" in the term ("Vietnam War era"). Go to entry for "era" for additional explanation.
**Vietnam Era**
: Capitalize Era in Vietnam Era. But lowercase "era" when you include "War" in the term ("Vietnam War era"). Go to entry for "era" for additional explanation.

**Vocational Rehabilitation Counselor (VRC)**
: Go to [Abbreviations and acronyms](https://design.va.gov/content-style-guide/abbreviations-and-acronyms) for guidance on using abbreviations on VA.gov.
Expand Down

0 comments on commit b713185

Please sign in to comment.