Skip to content

Commit

Permalink
Merge branch 'develop' into em-searchInput-component-#83
Browse files Browse the repository at this point in the history
  • Loading branch information
eamahanna committed Apr 30, 2020
2 parents e4b84f1 + e5b3917 commit 74c59e4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## UNRELEASED

## [1.2.0] - 2020-04-30

- Added new Alert styles (slim, no icon) and allow the Alert to accept `div` attributes as props
- Added additional examples of Form templates (Sign In form, Reset Password form) to Storybook
- Turn off USWDS SCSS notifications on compile
- Updated CODEOWNERS and contributors
- Fixed Jest running in CI
- Auto-approve Dependabot PRs
- Deploy Storybook static site on merge to master
- Run `yarn upgrade` to update all out of date dependencies
- Add [DangerJS](https://danger.systems/js/) to automate some checks for contribution standards
- Add additional CSS utility classes for background colors and text colors
Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trussworks/react-uswds",
"version": "1.1.0",
"version": "1.2.0",
"description": "React USWDS 2.0 component library",
"keywords": [
"react",
Expand Down Expand Up @@ -34,11 +34,14 @@
"type": "git",
"url": "github:trussworks/react-uswds"
},
"author": "Suzanne Rozier <suz@truss.works>",
"contributors": [
"Suzanne Rozier <suz@truss.works>",
"John Gedeon <john@truss.works>",
"Erin Stanfill <erin@truss.works>",
"Sara Bocciardi <sara@truss.works>"
"Sara Bocciardi <sara@truss.works>",
"Jeri Sommers <sojeri@truss.works>",
"Emily Mahanna <emahanna@truss.works>",
"Hana Worku <hana@truss.works>"
],
"license": "Apache-2.0",
"bugs": {
Expand Down

0 comments on commit 74c59e4

Please sign in to comment.