Skip to content

Commit

Permalink
Merge branch 'main' into m7adeel-combo_box-label
Browse files Browse the repository at this point in the history
  • Loading branch information
m7adeel authored Nov 3, 2023
2 parents 180d6a5 + 57e8f34 commit 4fcdb34
Show file tree
Hide file tree
Showing 11 changed files with 894 additions and 97 deletions.
127 changes: 35 additions & 92 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"projectOwner": "trussworks",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"files": ["README.md"],
"imageSize": 100,
"commit": true,
"contributors": [
Expand All @@ -14,248 +12,193 @@
"name": "Suzanne Rozier",
"avatar_url": "https://avatars.githubusercontent.com/u/2723066?v=4",
"profile": "https://github.com/suzubara",
"contributions": [
"code",
"doc"
]
"contributions": ["code", "doc"]
},
{
"login": "haworku",
"name": "haworku",
"avatar_url": "https://avatars.githubusercontent.com/u/10750442?v=4",
"profile": "https://github.com/haworku",
"contributions": [
"code",
"doc"
]
"contributions": ["code", "doc"]
},
{
"login": "ahobson",
"name": "Andrew Hobson",
"avatar_url": "https://avatars.githubusercontent.com/u/21983?v=4",
"profile": "https://github.com/ahobson",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "gidjin",
"name": "John Gedeon",
"avatar_url": "https://avatars.githubusercontent.com/u/940173?v=4",
"profile": "https://github.com/gidjin",
"contributions": [
"code",
"maintenance"
]
"contributions": ["code", "maintenance"]
},
{
"login": "eamahanna",
"name": "Emily Mahanna",
"avatar_url": "https://avatars.githubusercontent.com/u/56279459?v=4",
"profile": "https://github.com/eamahanna",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "brandonlenz",
"name": "Brandon Lenz",
"avatar_url": "https://avatars.githubusercontent.com/u/15805554?v=4",
"profile": "https://github.com/brandonlenz",
"contributions": [
"code",
"doc",
"maintenance",
"bug"
]
"contributions": ["code", "doc", "maintenance", "bug"]
},
{
"login": "sojeri",
"name": "Jeri Sommers",
"avatar_url": "https://avatars.githubusercontent.com/u/10818509?v=4",
"profile": "https://github.com/sojeri",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "tinyels",
"name": "Erin Stanfill",
"avatar_url": "https://avatars.githubusercontent.com/u/3142631?v=4",
"profile": "https://github.com/tinyels",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "esacteksab",
"name": "Barry Morrison",
"avatar_url": "https://avatars.githubusercontent.com/u/689591?v=4",
"profile": "http://www.barrymorrison.com/",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "duncan-truss",
"name": "Duncan",
"avatar_url": "https://avatars.githubusercontent.com/u/52669884?v=4",
"profile": "https://github.com/duncan-truss",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "SirenaBorracha",
"name": "Arianna Kellogg",
"avatar_url": "https://avatars.githubusercontent.com/u/16230705?v=4",
"profile": "https://github.com/SirenaBorracha",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "christopherhuii",
"name": "Christopher Hui",
"avatar_url": "https://avatars.githubusercontent.com/u/8367504?v=4",
"profile": "https://github.com/christopherhuii",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "jim",
"name": "Jim Benton",
"avatar_url": "https://avatars.githubusercontent.com/u/3331?v=4",
"profile": "http://pandasguide.com/",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "jenbutongit",
"name": "Jen Duong",
"avatar_url": "https://avatars.githubusercontent.com/u/22080510?v=4",
"profile": "https://github.com/jenbutongit",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "kimallen",
"name": "Kim Allen",
"avatar_url": "https://avatars.githubusercontent.com/u/13249580?v=4",
"profile": "https://github.com/kimallen",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "kylehilltruss",
"name": "Kyle Hill",
"avatar_url": "https://avatars.githubusercontent.com/u/83614364?v=4",
"profile": "https://github.com/kylehilltruss",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "rswerve",
"name": "Mazdak Atighi",
"avatar_url": "https://avatars.githubusercontent.com/u/8964335?v=4",
"profile": "https://github.com/rswerve",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "Igarfinkle",
"name": "Isaac Garfinkle",
"avatar_url": "https://avatars.githubusercontent.com/u/7664177?v=4",
"profile": "https://github.com/Igarfinkle",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "rogeruiz",
"name": "Roger Steve Ruiz",
"avatar_url": "https://avatars.githubusercontent.com/u/706004?v=4",
"profile": "https://github.com/rogeruiz",
"contributions": [
"code",
"doc"
]
"contributions": ["code", "doc"]
},
{
"login": "lpsinger",
"name": "Leo Singer",
"avatar_url": "https://avatars.githubusercontent.com/u/728407?v=4",
"profile": "https://github.com/lpsinger",
"contributions": [
"bug",
"code"
]
"contributions": ["bug", "code"]
},
{
"login": "Shkeating",
"name": "Shauna Keating",
"avatar_url": "https://avatars.githubusercontent.com/u/59394696?v=4",
"profile": "https://github.com/Shkeating",
"contributions": [
"a11y",
"code"
]
"contributions": ["a11y", "code"]
},
{
"login": "jcbcapps",
"name": "Jacob Capps",
"avatar_url": "https://avatars.githubusercontent.com/u/99674188?v=4",
"profile": "https://github.com/jcbcapps",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "pearl-truss",
"name": "pearl-truss",
"avatar_url": "https://avatars.githubusercontent.com/u/67110378?v=4",
"profile": "https://github.com/pearl-truss",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "werdnanoslen",
"name": "Andrew Nelson",
"avatar_url": "https://avatars.githubusercontent.com/u/764090?v=4",
"profile": "https://andyhub.com/",
"contributions": [
"code",
"doc"
]
"contributions": ["code", "doc"]
},
{
"login": "sawyerh",
"name": "Sawyer Hollenshead",
"avatar_url": "https://avatars.githubusercontent.com/u/371943?v=4",
"profile": "https://sawyer.soy",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "rpdelaney",
"name": "Ryan Delaney",
"avatar_url": "https://avatars.githubusercontent.com/u/1139517?v=4",
"profile": "https://keybase.io/rpdelaney",
"contributions": [
"maintenance",
"infra"
]
"contributions": ["maintenance", "infra"]
},
{
"login": "AnnaGingle",
"name": "Anna Gingle",
"avatar_url": "https://avatars.githubusercontent.com/u/48488699?v=4",
"profile": "https://github.com/AnnaGingle",
"contributions": ["design", "code"]
}
],
"contributorsPerLine": 7,
"commitConvention": "angular",
"commitType": "chore(all-contributors)"
}

25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,31 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [6.0.0](https://github.com/trussworks/react-uswds/compare/5.5.0...6.0.0) (2023-10-31)


### ⚠ BREAKING CHANGES

* `<TimePicker>` implementations must specify a `label` prop
* Dropdown has been removed use `<Select>` instead

### Features

* Delete deprecated Dropdown component ([#2644](https://github.com/trussworks/react-uswds/issues/2644)) ([59dffd1](https://github.com/trussworks/react-uswds/commit/59dffd138f745f38a222523360a4666c0c13b030))
* in-page navigation ([#2551](https://github.com/trussworks/react-uswds/issues/2551)) ([d330a12](https://github.com/trussworks/react-uswds/commit/d330a121b5abcc63f25882d34900fa76f6330a49))


### Bug Fixes

* Label is mandatory for TimePicker component ([#2629](https://github.com/trussworks/react-uswds/issues/2629)) ([c7f00d3](https://github.com/trussworks/react-uswds/commit/c7f00d35175d4dd0b59288eb34685edc9525cb0f))
* readme quick links ([#2646](https://github.com/trussworks/react-uswds/issues/2646)) ([d4c0b4e](https://github.com/trussworks/react-uswds/commit/d4c0b4e2f2b2c0924c35c96bea050ad8c2a2ae19))
* Updates sign in stories to fix aria-controls issue of show password button ([#2627](https://github.com/trussworks/react-uswds/issues/2627)) ([67c1114](https://github.com/trussworks/react-uswds/commit/67c1114ab1eea857dc76271deb5c85672505e40a))


### Documentation & Examples

* add @AnnaGingle as a contributor ([#2649](https://github.com/trussworks/react-uswds/issues/2649)) ([c307f4b](https://github.com/trussworks/react-uswds/commit/c307f4b2a4989b911dd4339da8fe0181825925b1))

## [5.5.0](https://github.com/trussworks/react-uswds/compare/5.4.0...5.5.0) (2023-10-20)


Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @trussworks/react-uswds

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-27-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

[![npm version](https://img.shields.io/npm/v/@trussworks/react-uswds)](https://www.npmjs.com/package/@trussworks/react-uswds)
Expand Down Expand Up @@ -107,7 +107,7 @@ This repository is governed by the [Contributor Covenant](./CODE_OF_CONDUCT.md)

### Quick links:

- [Yarn scripts](./docs/contributing#available-commands)
- [Yarn scripts](./docs/contributing.md#available-commands)
- [PR commit guidelines](./docs/contributing.md#opening--merging-pull-requests)
- [Adding new components](./docs/adding_new_components.md)
- [Testing in an application](./docs/contributing.md#testing-in-an-application)
Expand Down Expand Up @@ -171,6 +171,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://andyhub.com/"><img src="https://avatars.githubusercontent.com/u/764090?v=4?s=100" width="100px;" alt="Andrew Nelson"/><br /><sub><b>Andrew Nelson</b></sub></a><br /><a href="https://github.com/trussworks/react-uswds/commits?author=werdnanoslen" title="Code">πŸ’»</a> <a href="https://github.com/trussworks/react-uswds/commits?author=werdnanoslen" title="Documentation">πŸ“–</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://sawyer.soy"><img src="https://avatars.githubusercontent.com/u/371943?v=4?s=100" width="100px;" alt="Sawyer Hollenshead"/><br /><sub><b>Sawyer Hollenshead</b></sub></a><br /><a href="https://github.com/trussworks/react-uswds/commits?author=sawyerh" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://keybase.io/rpdelaney"><img src="https://avatars.githubusercontent.com/u/1139517?v=4?s=100" width="100px;" alt="Ryan Delaney"/><br /><sub><b>Ryan Delaney</b></sub></a><br /><a href="#maintenance-rpdelaney" title="Maintenance">🚧</a> <a href="#infra-rpdelaney" title="Infrastructure (Hosting, Build-Tools, etc)">πŸš‡</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AnnaGingle"><img src="https://avatars.githubusercontent.com/u/48488699?v=4?s=100" width="100px;" alt="Anna Gingle"/><br /><sub><b>Anna Gingle</b></sub></a><br /><a href="#design-AnnaGingle" title="Design">🎨</a> <a href="https://github.com/trussworks/react-uswds/commits?author=AnnaGingle" title="Code">πŸ’»</a></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trussworks/react-uswds",
"version": "5.5.0",
"version": "6.0.0",
"description": "React USWDS 3.0 component library",
"keywords": [
"react",
Expand Down
9 changes: 9 additions & 0 deletions src/components/InPageNavigation/InPageNavigation.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@media not (prefers-reduced-motion) {
html {
scroll-behavior: smooth;
}
}

:target {
scroll-margin-top: var(--margin-offset);
}
Loading

0 comments on commit 4fcdb34

Please sign in to comment.