Skip to content

Commit

Permalink
Merge branch 'version-1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
peteryates committed Nov 19, 2019
2 parents 70fcded + a6e8947 commit c1c2f69
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 21 deletions.
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@
[![Test Coverage](https://api.codeclimate.com/v1/badges/fde73b5dc9476197281b/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk_design_system_formbuilder/test_coverage)
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=DFE-Digital/govuk_design_system_formbuilder)](https://dependabot.com)
[![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk_design_system_formbuilder)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/blob/master/LICENSE)
[![GOV.UK Design System Version 2](https://img.shields.io/github/v/release/dfe-digital/govuk_design_system_formbuilder?label=govuk+design+system+v2)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases/tag/v0.7.10)
[![GOV.UK Design System Version 3](https://img.shields.io/github/v/release/dfe-digital/govuk_design_system_formbuilder?include_prereleases&label=govuk+design+system+v3)](https://github.com/DFE-Digital/govuk_design_system_formbuilder)
[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.4.0-brightgreen)](https://design-system.service.gov.uk)

This gem provides a easy-to-use form builder that generates forms that are
fully-compliant with version 3.3.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/),
fully-compliant with version 3.4.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/),
minimising the amount of markup you need to write.

The latest version of this gem that supports GOV.UK Design System version 2 is
[0.7.10](https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases/tag/v0.7.10).

In addition to the basic markup, the more-advanced functionality of the Design
System is exposed via the API. Adding [JavaScript-enhanced word count
checking](https://govuk-form-builder.netlify.com/form-elements/text-area/)
Expand Down Expand Up @@ -108,7 +104,7 @@ Now we can get started!
= f.govuk_submit 'Away we go!'
```

## Developing and running the tests 🧑🏼‍🔬
## Developing and running the tests 👨🏻‍🏭

The form builder is covered by RSpec, to run all the tests first ensure that
all of the development and testing prerequisite gems are installed. At the root
Expand All @@ -124,7 +120,7 @@ Now, if everything was successful, run RSpec:
bundle exec rspec -fd
```

## Contributing 🎁
## Contributing 📦

Bug reports and feature requests are most welcome, please raise an issue or
submit a pull request.
Expand Down
9 changes: 1 addition & 8 deletions guide/content/introduction/supported-versions.slim
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ dl.govuk-summary-list
ul.govuk-list
li
span.govuk-tag
| Version 3.3.0

ul.govuk-list
li
span.govuk-hint
' If you are using version 2 of the GOV.UK design system, the last compatible
version of this form builder was
#{link_to('0.7.10', version_supporting_design_system_v2).html_safe}.
| Version 3.4.0

div.govuk-summary-list__row
dt.govuk-summary-list__key
Expand Down
6 changes: 3 additions & 3 deletions guide/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion guide/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"author": "",
"license": "ISC",
"dependencies": {
"govuk-frontend": "^3.3.0"
"govuk-frontend": "^3.4.0"
}
}
2 changes: 1 addition & 1 deletion lib/govuk_design_system_formbuilder/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module GOVUKDesignSystemFormBuilder
VERSION = '0.9.8'.freeze
VERSION = '1.0.0'.freeze
end

0 comments on commit c1c2f69

Please sign in to comment.