Skip to content

Commit

Permalink
Feature/upstream changes (#22)
Browse files Browse the repository at this point in the history
* Update Task List pattern to show it is being worked on

This aims to give people greater visibility over the work that is currently being done on this pattern and component.

Also updates the research section to add some additional known issues based on research gathered by the cross-government collaboration.

* Fix typo

Co-authored-by: Paul Hayes <fofr@users.noreply.github.com>

* Link homepage to Home Office Design System

* First draft

Co-Authored-By: Chris Hill-Scott <me@quis.cc>
Co-Authored-By: Calvin Lau <77630796+calvin-lau-sig7@users.noreply.github.com>

* Add new draft after working group review

* Refinements

Co-Authored-By: Calvin Lau <77630796+calvin-lau-sig7@users.noreply.github.com>

* Final review from team and working group

Co-Authored-By: Calvin Lau <77630796+calvin-lau-sig7@users.noreply.github.com>
Co-Authored-By: EoinShaughnessy <72507742+EoinShaughnessy@users.noreply.github.com>

* Empty commit to kick off build

* Fix typo

* Add Ast to team list

* Update src/design-system-team.md.njk

Co-authored-by: Vanita Barrett-Smith <vanita.barrett@digital.cabinet-office.gov.uk>

* Changed field labels to 'Address line 1' and 'Address line 2'

This change did three things:
1. Stopped the second field label being invisible
2. Added 'optional' to second field label
3. Made the labels 'Address line 1' and 'Address line 2'

* Add message about co-design work

Fix HTML in status message instead of Markdown

Apply content tweak to message

Co-Authored-By: Chris Ballantine-Thomas <chris.ballantinethomas@digital.cabinet-office.gov.uk>

* Update for April 2021, new patterns

Minor tweak

Tweak

* address fieldset is now aligned with the new address fields

* Bump moment from 2.24.0 to 2.29.2

Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.24.0...2.29.2)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update html label to text within macro

* Put county field back in address pattern and update guidance

* update image to generic journey on the check a service is suitable pattern page

* Bump urijs from 1.19.10 to 1.19.11

Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.10 to 1.19.11.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](medialize/URI.js@v1.19.10...v1.19.11)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove ƒ typo in fieldset example

* Fix autocomplete values in multiple address example

* Add latest blog posts April 2022

* Fix dashes and punctuation

* update image to make it neater on the check a service is suitable pattern page

* update image to make it neater on the check a service is suitable pattern page and compress it to save space

* Update Node to Active LTS version v16 (Gallium)

Node.js v14 has been in maintenance mode from 19 October 2021. v16 is the active LTS version.

This in turns updates NPM to v8, meaning our lockfile has change to [`lockfileVersion` 2](https://docs.npmjs.com/cli/v8/configuring-npm/package-lock-json#lockfileversion)

This is an internal change that affects development, testing and deployment.

* Add troubleshooting documentation for Node 16, node-sass and M1 machines

If a user has previously installed locally using Node 14 and lower on their M1 machine, they will encounter `node-sass` errors when running `npm install` after pulling this commit.

This adds documentation to deal with those errors.

This should only affect developers.

* Update metalsmith to latest version (2.4.2)

* Install @metalsmith/sass

* Uninstall metalsmith-sass and node-sass

We've installed @metalsmith/sass which uses sass (Dart Sass)
under the hood instead.

* Set `quietDeps` to true and move config to @metalsmith/sass syntax

Move the existing sass config to @metalsmith/sass syntax (uses loadPaths
instead of includePaths)

Set the `quietDeps` flag to true to suppress sass  deprecation warnings for
division (/) and any future deprecations coming from GOV.UK Frontend.

* Add 'src/stylesheets' to sass loadPaths

Dart Sass wasn't able to resolve the import for 'example-init', which
we use within our component example sass.

Telling it to look in 'src/stylesheets' to resolve imports, so it can find
this file.

* Remove node-sass on node v16 troubleshooting docs

We've updated Metalsmith and moved to Dart Sass, so this issue no longer applies (see alphagov#2150)

* Add new team member

* Make help text advice clearer in fieldset guidance

* Add placeholder text info to text input guidance

* Revert town or city field to use address-level2

* Explain issues with client side validation

* Add implementation advice to skip link guidance

* Add subheadings to text input guidance

* Replace double quotes with singles in example

* Updating error example for National Insurance number to use correct format

* adding format guidance for National Insurance number

* Update design-system-team.md.njk

Added myself to the team member list

* Update src/design-system-team.md.njk

Co-authored-by: Kimberly Grey <kimberly.grey@digital.cabinet-office.gov.uk>

* Update src/patterns/national-insurance-numbers/index.md.njk

Co-authored-by: Calvin Lau <77630796+calvin-lau-sig7@users.noreply.github.com>

* Move #top anchor to before the skip link

The ‘back to top’ link takes users to the #top anchor point, which is currently before the navigation but after the ‘skip to main content’ link.

This means you can no longer skip past the navs etc (as per WCAG 2.1 2.4.1 Bypass Blocks [1]) unless you know to press shift + tab to go backwards in the tab order.

Insetead, we want the 'back to top' link to take the user to the very top of the page, so that the next tab will take them to ‘Skip to main content’ (or the cookie banner, if it’s not been dismissed).

We also considered taking the user to the start of `#main` [2], bypassing all of the navigation, but opted instead to move the `#top` anchor to be the very first thing because:

1. The back to top link was introduced in alphagov#687, when we moved from the side navigation and the main content being fixed, independently scrollable panes. This change meant that the side navigation no longer remained within the viewport.

It seems that the intent at the time was that the back to top link would bring the side navigation back into view, rather than providing a convenient way for the user to get back to the top of the main content.

2. Linking to #main makes it harder for users who have to get back to the navigation:

> If you're using a screen reader you could jump between landmarks using hot keys, but if you're just using a keyboard you're kinda just left with the tab key. Maybe I'm missing something, but the only options I could see to get back to the nav would be:
>
> - use TAB to go all the way through the content and footer content until you eventually get back to the top of the page
> - use back to top to get to the top of the main, and then use SHIFT+TAB to reverse through the nav menu
> - refresh the page and use TAB

3. We think users would expect to see the header when using the ‘Back to top’ link, especially if they were aiming for the navigation.

[1]: https://www.w3.org/TR/WCAG21/#bypass-blocks
[2]: alphagov#1561 (comment)

Closes alphagov#1561

* Make layout name consistent throughout guidance

* Update guidance on footer component

This proposed update:

- adds links to relevant information on privacy notices, cookie pages and accessibility statements
- clarifies copyright and licensing information

Related issues:

alphagov#1225
alphagov#1306

* Update character count guidance to match new implementation

* Minor edits for consistency

* Clarify and add accessibility information

* Update What's New section for v4.1.0

* Update roadmap

* Add context to JAWS issue

* Bump govuk-frontend to 4.1.0

* Add nodeListForEach helper directly into design system

The GOV.UK Frontend ES modules don't make the common (e.g: `nodeListForEach`)
function available to import. We've made this decision intentionally as we never
really intended for `nodeListForEach` to be something we provided.

This introduces a helper.js file which contains `nodeListForEach`. Switch our
JS files to use that helper, rather than the one from GOV.UK Frontend.

* Replace individual JS imports with ES modules initAll

* Explain that red border depends on exceeding limit

* Add accurate content for email field char limit

* Replace in guidance and examples

-  error message
 - textarea
 - text input
 - character count (including error example)

* Bump actions/setup-node from v2 to v3

* Use node-version-file input to specify node version

actions/setup-node v2.5.0 and above support reading a .nvmrc file itself [[1]].
This lets us simplify our code.

[1]: https://github.com/actions/setup-node/releases/tag/v2.5.0

* Make validation guidance language more consistent

* Remove patterns

* Update package-lock.json

* Remove GDS community text

Co-authored-by: Frankie Roberto <frankie@frankieroberto.com>
Co-authored-by: Paul Hayes <fofr@users.noreply.github.com>
Co-authored-by: EoinShaughnessy <eoin.shaughnessy@digital.cabinet-office.gov.uk>
Co-authored-by: EoinShaughnessy <72507742+EoinShaughnessy@users.noreply.github.com>
Co-authored-by: Chris Hill-Scott <me@quis.cc>
Co-authored-by: Calvin Lau <77630796+calvin-lau-sig7@users.noreply.github.com>
Co-authored-by: Chris Thomas <christopher.thomas@digital.cabinet-office.gov.uk>
Co-authored-by: Kimberly Grey <kimberly.grey@digital.cabinet-office.gov.uk>
Co-authored-by: Vanita Barrett-Smith <vanita.barrett@digital.cabinet-office.gov.uk>
Co-authored-by: terrysimpson99 <48089049+terrysimpson99@users.noreply.github.com>
Co-authored-by: Chris Ballantine-Thomas <chris.ballantinethomas@digital.cabinet-office.gov.uk>
Co-authored-by: Ciandelle Scollan <ciandelle.scollan@digital.cabinet-office.gov.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ciandelle Scollan <100923629+Ciandelle@users.noreply.github.com>
Co-authored-by: Oliver Byford <oliver.byford@digital.cabinet-office.gov.uk>
Co-authored-by: domoscargin <brett.kyle@digital.cabinet-office.gov.uk>
Co-authored-by: ameliaphil <104211564+ameliaphil@users.noreply.github.com>
Co-authored-by: Colin Oakley <colin.oakley@engineering.digital.dwp.gov.uk>
Co-authored-by: Ruth Hammond <91464546+ruthhammond@users.noreply.github.com>
Co-authored-by: Colin <colin@htmlandbacon.com>
Co-authored-by: StephenGill <stephen.gill@digital.cabinet-office.gov.uk>
Co-authored-by: Laurence de Bruxelles <laurence.debruxelles@digital.cabinet-office.gov.uk>
  • Loading branch information
23 people committed May 26, 2022
1 parent f7f2acc commit feab308
Show file tree
Hide file tree
Showing 16 changed files with 19,030 additions and 9,308 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Read node version from .nvmrc
id: nvm
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: "${{ steps.nvm.outputs.NVMRC }}"
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.6
16.14.2
5 changes: 3 additions & 2 deletions lib/metalsmith.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const tagcleaner = require('metalsmith-tagcleaner') // Use tag cleaner to remove
const permalinks = require('metalsmith-permalinks') // apply a permalink pattern to files
const canonical = require('metalsmith-canonical') // add a canonical url property to pages

const sass = require('metalsmith-sass') // convert Sass files to CSS using LibSass
const sass = require('@metalsmith/sass') // convert Sass files to CSS using Dart Sass
const postcss = require('metalsmith-postcss')

const rollup = require('metalsmith-rollup') // used to build GOV.UK Frontend JavaScript
Expand Down Expand Up @@ -69,7 +69,8 @@ module.exports = metalsmith(__dirname) // __dirname defined by node.js: name of

// convert *.scss files to *.css
.use(sass({
includePaths: ['node_modules'] // an array of paths that sass can look in when attempt to resolve @import declarations
quietDeps: true,
loadPaths: ['node_modules', 'src/stylesheets'] // an array of paths that sass can look in when attempt to resolve @import declarations
}))

.use(postcss({
Expand Down
Loading

0 comments on commit feab308

Please sign in to comment.