Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #125

Open
wants to merge 988 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
988 commits
Select commit Hold shift + click to select a range
9dc2cfb
Merge pull request #1774 from alphagov/group-helpers-objects
36degrees May 27, 2020
9cd6c8c
Enhance wrapping behaviour for collapseOnMobile
May 27, 2020
f6a9042
Add to changelog
Mar 2, 2020
9a77bee
Merge pull request #1754 from vanitabarrett/collapse-breadcrumbs
36degrees May 28, 2020
e7a677e
Update README
m-green May 28, 2020
f5dbdaf
Add the ability to specify HTML for a navigation item
adamsilver May 28, 2020
e4121d0
Update src/govuk/components/header/template.test.js
adamsilver May 28, 2020
9d04359
Merge pull request #1819 from adamsilver/adam-header-navigation-item-…
36degrees May 28, 2020
f8c57e9
Update changelog with style edits
m-green May 21, 2020
ab99f03
Re-add collapseOnMobile
m-green May 28, 2020
2e2e82c
Merge pull request #1818 from alphagov/update_readme_for_new_dist_docs
m-green May 28, 2020
5810249
Merge pull request #1814 from alphagov/edit_changelog_3.7.0
m-green May 28, 2020
abd8887
Remove duplication of 'pull request' in changelog
m-green Jun 1, 2020
7e7a8ce
Merge pull request #1821 from alphagov/fix_changelog_duplication
m-green Jun 1, 2020
2cc288d
Deep link to guidance on collapsing breadcrumbs
36degrees Jun 1, 2020
ba56dc2
Merge pull request #1822 from alphagov/deep-link-collapsing-breadcrumbs
36degrees Jun 1, 2020
2852360
Release v3.7.0
36degrees Jun 1, 2020
9b73de1
Add credits; remove duplicated changelog entry
36degrees Jun 1, 2020
9cc3871
Clarify deprecation note
36degrees Jun 1, 2020
3932f5d
Merge pull request #1823 from alphagov/release-v3.7.0
36degrees Jun 1, 2020
b9eca6a
Add serviceUrl to latest header example which includes serviceName
andymantell Jun 2, 2020
eb280cc
Merge pull request #1825 from andymantell/tweak-header-examples
hannalaakso Jun 3, 2020
6b00f36
Fix typo in release-to-branch script
36degrees Jun 17, 2020
b327931
Correctly camel case SVG attributes
36degrees Jun 17, 2020
a6d3131
Merge pull request #1837 from alphagov/fix-typo-script
36degrees Jun 17, 2020
4bf97cc
Add to changelog
36degrees Jun 17, 2020
4a9d392
Merge pull request #1838 from alphagov/camelcase-svg-attributes
36degrees Jun 18, 2020
6d33191
Preserve conditional reveal state when going back
36degrees Jun 19, 2020
aaff8f9
Document in CHANGELOG
36degrees Jun 19, 2020
44ecae6
Always sync on either pageshow or DOMContentLoaded
36degrees Jun 25, 2020
d29b200
Clarify function names
36degrees Jun 25, 2020
82c5bf0
Avoid unneccesary function
36degrees Jun 25, 2020
efa0b84
Improve consistency between radios and checkboxes
36degrees Jun 25, 2020
d6dd1f0
Simplify and improve code comments
36degrees Jun 25, 2020
ffc30f4
Merge pull request #1842 from alphagov/conditional-reveals-back-button
36degrees Jun 30, 2020
3544d81
Add example of Slack message
m-green Jul 1, 2020
e48b58c
Minor style tweak
m-green Jul 1, 2020
3153c2c
Remove old folders and move examples
m-green Jul 1, 2020
0311781
Remove unneccesary binds in character count
36degrees Jul 1, 2020
f92358b
Add credit to example Slack message
m-green Jul 2, 2020
b532a69
Merge pull request #1851 from alphagov/remove-old-docs-folders
m-green Jul 6, 2020
7680cb3
Merge pull request #1850 from alphagov/add-release-comms
m-green Jul 6, 2020
48644c1
Check target has conditional class before acting
36degrees Jul 7, 2020
3e7a435
Use consistent variable names for target
36degrees Jul 7, 2020
d755156
Merge pull request #1852 from alphagov/character-count-bind
36degrees Jul 7, 2020
cdb1cfd
Fix file paths
hannalaakso Jul 8, 2020
2ab624b
Merge pull request #1854 from alphagov/fix-file-paths
hannalaakso Jul 8, 2020
d92d3c8
Switch hint from span to div
Jul 8, 2020
843754c
Update tests
Jul 8, 2020
266f091
Add to Changelog
Jul 8, 2020
6e3a992
Merge pull request #1855 from alphagov/make-hint-block-element
Jul 8, 2020
5373696
Add JSDoc and improve function names
36degrees Jul 8, 2020
4487588
Use better 'autocomplete' example for date input
36degrees Jul 9, 2020
3e5a7b0
Make dark grey darker
May 20, 2020
579a7c5
Document in changelog
Jun 16, 2020
2f73bd6
Merge pull request #1827 from alphagov/darken-secondary-text
Jul 9, 2020
69c9e65
Add spellcheck option to textarea
Jul 9, 2020
9a8b9f0
Add spellcheck option to input
Jul 9, 2020
1f566fe
Update full page example to use spellcheck param
Jul 10, 2020
5a062f1
Add to changelog
Jul 10, 2020
717d054
Merge pull request #1847 from alphagov/checkboxes-radios-misc-improve…
36degrees Jul 14, 2020
5960b6a
Update node-sass, sassdoc and yargs
36degrees Jul 14, 2020
b6b5da3
Update packages within semver ranges
36degrees Jul 14, 2020
56543d0
Disable region tests
36degrees Jul 14, 2020
7aac5d5
Update jest to latest version
36degrees Jul 14, 2020
ed75339
Update Standard to latest
36degrees Jul 14, 2020
44cf434
Fix linting violations identified by Standard 14
36degrees Jul 14, 2020
436a599
Merge pull request #1859 from alphagov/add-spellcheck-option
Jul 14, 2020
c3b7d01
Update express-validator to latest
36degrees Jul 14, 2020
ecbdede
Update front-matter to latest
36degrees Jul 14, 2020
c804c16
Update gulp-rename to latest
36degrees Jul 14, 2020
a2c573f
Update marked to latest
36degrees Jul 14, 2020
ffcfc57
Update jest-puppeteer to 2.x
36degrees Jul 14, 2020
2a89902
Update Frontend Toolkit / Template
36degrees Jul 14, 2020
36edb2f
Merge pull request #1857 from alphagov/better-autocomplete-example
36degrees Jul 15, 2020
a341565
Fix checkbox if border-box sizing applied globally
36degrees Jul 15, 2020
0cf3375
Add to changelog
36degrees Jul 15, 2020
f57d338
Merge pull request #1861 from alphagov/box-sizing-checkboxes
36degrees Jul 16, 2020
d425b29
Fix warning text if border-box sizing applied globally
36degrees Jul 15, 2020
317e339
Add to changelog
36degrees Jul 15, 2020
75c3ddc
Merge pull request #1862 from alphagov/box-sizing-warning-icon
36degrees Jul 16, 2020
3fd67be
Preserve the state of character count when navigating 'back'
Jul 14, 2020
5a344b3
Add to changelog
Jul 16, 2020
ce8e223
Merge pull request #1868 from alphagov/update-character-count-back
Jul 16, 2020
6bdca06
Reduce border width of form inputs in error state
Jul 2, 2020
2bde81d
Remove border from file upload error state
Jul 17, 2020
e5e2b5b
Deprecate $govuk-border-width-form-element-error
36degrees Jul 17, 2020
2ee4810
Add missing spellcheck param to character count
Jul 17, 2020
a12c384
Add to Changelog
Jul 17, 2020
80bc916
Merge pull request #1869 from alphagov/add-missing-spellcheck-to-char…
Jul 17, 2020
bc89e17
Bump lodash from 4.17.15 to 4.17.19
dependabot[bot] Jul 20, 2020
416de5e
Merge pull request #1872 from alphagov/dependabot/npm_and_yarn/lodash…
36degrees Jul 20, 2020
6c9a5e2
Remove etc and negative contractions
m-green Jul 21, 2020
891552c
Document in changelog
36degrees Jul 21, 2020
cea9996
Merge pull request #1870 from alphagov/fix-error-focus-states
36degrees Jul 21, 2020
3b6a9b9
Merge pull request #1874 from alphagov/accessibility-fixes
m-green Jul 23, 2020
d2044ab
Explicitly set outline-offset to remove 1px transparent border in chr…
rorywilsonros Jul 22, 2020
2339e8a
Merge pull request #1879 from rorywilsonros/patch-1
Jul 23, 2020
93bb1db
Update 3.8.0 (unreleased) changelog for style
m-green Jul 23, 2020
63f2b23
Changes from SME review
m-green Jul 23, 2020
a243385
Merge pull request #1860 from alphagov/update-dependencies
36degrees Jul 24, 2020
228b8bf
Fix typo in compile assets task
36degrees Jul 27, 2020
158c112
Merge pull request #1883 from alphagov/fix-typo-compile-assets
36degrees Jul 27, 2020
9892ac3
Minor 2i tweak and add colour change PR
m-green Jul 27, 2020
02bebd7
Merge pull request #1881 from alphagov/3.8-changelog-style
36degrees Jul 27, 2020
5e2cf67
Release v3.8.0
Jul 29, 2020
3e0da06
Merge pull request #1886 from alphagov/release-3.8.0
Jul 29, 2020
35c8ffc
Update release docs
Jul 29, 2020
ca354fa
Remove "type: text" from textarea examples
andymantell Jul 30, 2020
b573391
Merge pull request #1891 from andymantell/patch-2
Jul 30, 2020
b307862
Merge pull request #1887 from alphagov/update-release-docs
Jul 31, 2020
e7ad980
Rename 'release' to 'publish-release'
Aug 3, 2020
2d739bd
Rename 'pre-release' to 'build-release'
Aug 3, 2020
c6d101c
Rename 'release-to-branch' to 'pre-release'
Aug 3, 2020
54cac19
Merge pull request #1893 from alphagov/clarify-pre-release
Aug 3, 2020
b8eecc5
Test if template inline JS matches published hash
hannalaakso Jul 28, 2020
844a51e
Merge pull request #1884 from alphagov/test-inline-script-hash
hannalaakso Aug 4, 2020
306e49f
Swap modern and legacy palettes in colour settings
36degrees Aug 5, 2020
7f6a45e
Merge pull request #1901 from alphagov/swap-colour-palettes
36degrees Aug 10, 2020
868d13c
Fix character count shrinking as you go over limit
36degrees Aug 13, 2020
4d63b84
Document in changelog
36degrees Aug 13, 2020
bd2f03d
Merge pull request #1912 from alphagov/fix-character-count-shrinking
36degrees Aug 13, 2020
3f0f76d
Release v3.8.1
36degrees Aug 13, 2020
eca3355
Merge pull request #1914 from alphagov/release-v3.8.1
36degrees Aug 13, 2020
4572d62
Allow hardcoded text in header to be customised
hannalaakso Aug 5, 2020
0c8c5ea
Update changelog
hannalaakso Aug 11, 2020
e519d01
Merge pull request #1905 from alphagov/header-localisation
hannalaakso Aug 13, 2020
0402394
Add new brand colour for FCDO
deborahchua Aug 12, 2020
22c6cd4
Add ability to hide examples in YAML file
Aug 10, 2020
d1b60fc
Warning text
Aug 10, 2020
38f708c
Textarea
Aug 10, 2020
4ac55cf
Tag
Aug 11, 2020
2b7a162
Merge pull request #1918 from deborahchua/add-colour-for-fcdo
36degrees Aug 21, 2020
86ef1ae
Update dot-prop to 4.2.1
36degrees Aug 27, 2020
cbebae6
Update acorn to 7.4.0
36degrees Aug 27, 2020
8c1f2d9
Update other packages within semver range
36degrees Aug 27, 2020
0867978
Tabs
Aug 11, 2020
24fa550
Table
Aug 11, 2020
9bbee1e
Summary list
Aug 11, 2020
c7e7272
Skip link
Aug 17, 2020
d10b003
Select
Aug 25, 2020
e50c84d
Radios
Aug 18, 2020
f5c7e87
Phase banner
Aug 18, 2020
bbfea16
Panel
Aug 18, 2020
754b1eb
Label
Aug 18, 2020
0f23d85
Inset text
Aug 19, 2020
c953d40
Input
Aug 19, 2020
80480a5
Hint
Aug 19, 2020
5a8e42a
Header
Aug 19, 2020
6aa6b40
Footer
Aug 19, 2020
4e9a88b
File upload
Aug 19, 2020
be08f01
Fieldset
Aug 19, 2020
5b6fd7b
Error summary
Aug 19, 2020
bcc2ce3
Error message
Aug 19, 2020
e17c0a8
Details
Aug 19, 2020
d356e6d
Date input
Aug 20, 2020
6e720a9
Checkboxes
Aug 20, 2020
f0dc286
Character count
Aug 20, 2020
d0bd57d
Button
Aug 20, 2020
67d8f21
Breadcrumbs
Aug 20, 2020
34e56fd
Back link
Aug 20, 2020
2ae642d
Accordion
Aug 20, 2020
ceb6767
Add html param to fieldset as alternative to caller
Aug 21, 2020
55aadb5
Default example only uses required fields
Aug 26, 2020
0bd7652
Mark hint id as not required
Aug 26, 2020
b08080e
Remove unused button example
Aug 27, 2020
4dca673
Merge pull request #1931 from alphagov/update-dependencies
36degrees Sep 1, 2020
d5b8575
Fix incorrect component names in package READMEs
36degrees Sep 2, 2020
176d3a1
Merge pull request #1939 from alphagov/fix-package-readme-links
36degrees Sep 2, 2020
b58ca36
Add note to contributing about using hidden:true in yaml files
m-green Aug 19, 2020
b87c026
Merge pull request #1924 from alphagov/component-test-files-use-examples
Sep 2, 2020
3333730
Generate fixtures.json files for components on build:package
Aug 25, 2020
07236aa
Separate out gulp functions to make task easier to read
Aug 25, 2020
39a638a
Add to Changelog
Sep 2, 2020
3daa245
Merge pull request #1925 from alphagov/generate-fixtures
Sep 2, 2020
9128ad3
Fix typo: checkbox -> radio
lfdebrux Aug 20, 2020
9621c93
Merge pull request #1941 from lfdebrux/ldeb-fix-typos
36degrees Sep 2, 2020
142395a
Make it possible to exclude link from header nav
hannalaakso Aug 18, 2020
2cb9442
Change header menu button label
Sep 3, 2020
41e25bf
Update changelog
hannalaakso Aug 18, 2020
f3d5aaf
Improve existing test coverage for navigation item
hannalaakso Sep 2, 2020
01c9c9c
Add to Changelog
Sep 3, 2020
f56b03d
Merge pull request #1921 from alphagov/custom-html-links
hannalaakso Sep 3, 2020
5672a08
Merge pull request #1943 from alphagov/header-label-name
Sep 3, 2020
790c2eb
Use (polyfilled) classList.toggle function
36degrees Sep 3, 2020
453c47c
Define visibility once and sync state together
36degrees Sep 3, 2020
760ad18
Fix typo in comment
36degrees Sep 3, 2020
18771ce
Expose aria attributes when initialising
36degrees Sep 3, 2020
a35849b
Update existing tests
36degrees Sep 3, 2020
4e77059
Document in CHANGELOG
36degrees Sep 3, 2020
befc348
Merge pull request #1942 from alphagov/header-aria-fixes
36degrees Sep 7, 2020
02eaf04
Add prefix and suffix
simonwhatley May 22, 2020
0430f7c
Updates following working group review
simonwhatley Jul 3, 2020
6472ca5
Swap <span> elements for <div> elements
hannalaakso Aug 19, 2020
e86c00c
Tidy up (template, scss, yaml)
hannalaakso Sep 1, 2020
d70af32
Add template tests and examples for them
hannalaakso Sep 1, 2020
111cc2e
Split prefix/suffix onto own line on narrow screens
hannalaakso Sep 1, 2020
f011cbb
Improve rendering on IE8
hannalaakso Aug 27, 2020
e23594f
Add an example using a width modifier
hannalaakso Sep 1, 2020
0a31856
Update changelog
hannalaakso Sep 2, 2020
b244715
Add print styles for the panel component
36degrees Sep 7, 2020
95044b1
Document in changelog
36degrees Sep 7, 2020
dc5e752
Merge pull request #1816 from simonwhatley/add-input-prefix-suffix
hannalaakso Sep 7, 2020
9aa0ca2
Merge pull request #1947 from alphagov/panel-print-styles
36degrees Sep 8, 2020
b92172b
Edit and restructure changelog for style and readability
m-green Sep 3, 2020
4f710e6
Remove duplicated section
m-green Sep 8, 2020
8e55dfc
Changes from SME review
m-green Sep 8, 2020
56edb17
Merge pull request #1948 from alphagov/edit-3.9.0-release-note
hannalaakso Sep 10, 2020
6dd1b3f
Release v3.9.0
hannalaakso Sep 10, 2020
ecac371
Basic stylelint installation
kevindew May 25, 2020
56c59ae
Add stylelint-config-gds
kevindew May 25, 2020
d8cd980
Turn on at-rule-name-space-after stylelint rule
kevindew Jul 7, 2020
bc8f797
Turn on block-closing-brace-empty-line-before stylelint rule
kevindew Jul 7, 2020
68b3915
Turn on declaration-block-trailing-semicolon rule
kevindew Jul 8, 2020
3c5ab3f
Turn on declaration-colon-newline-after stylelint rule
kevindew Jul 8, 2020
e69eb81
Turn on declaration-colon-space-after stylelint rule
kevindew Jul 8, 2020
7b8dee7
Turn on function-comma-newline-after stylelint rule
kevindew Jul 8, 2020
149dc46
Turn on function-parentheses-newline-inside stylelint rule
kevindew Jul 8, 2020
f3c14a5
Turn on max-empty-lines styline rule
kevindew Jul 9, 2020
ba6641d
Turn on media-feature-name-no-unknown stylelint rule
kevindew Jul 9, 2020
22b7dd4
Turn on media-feature-parentheses-space-inside stylelint rule
kevindew Jul 9, 2020
e922a64
Turn on no-duplicate-selectors stylelint rule
kevindew Jul 9, 2020
96d1943
Turn on no-eol-whitespace stylelint rule
kevindew Jul 9, 2020
8a1ce73
Turn on no-extra-semicolons stylelint rule
kevindew Jul 9, 2020
b3a6fef
Turn on rule-empty-line-before styelint rule
kevindew Jul 9, 2020
af9899f
Turn on scss/comment-no-loud rule
kevindew Jul 9, 2020
0da26f5
Turn on scss/operator-no-unspaced
kevindew Jul 9, 2020
4943329
Turn on selector-type-no-unknown stylelint rule
kevindew Jul 9, 2020
4402115
Turn on value-keyword-case stylelint rule
kevindew Jul 9, 2020
d66c28e
Turn on value-list-max-empty-lines stylelint rule
kevindew Jul 9, 2020
880b660
Turn on indendation stylelint rule
kevindew Jul 9, 2020
09ef79d
Turn on selector-pseudo-element-colon-notation stylelint rule
kevindew Jul 15, 2020
4a2c66b
Add govuk-frontend CSS ordering rules
kevindew Jul 9, 2020
2d587fd
Turn on declaration-no-important stylelint rule
kevindew Aug 19, 2020
dabd0a4
Update stylelint disable comments for Stylelint 13.7.0
kevindew Sep 2, 2020
6d1b0b7
Merge pull request #1953 from alphagov/release-3.9.0
hannalaakso Sep 14, 2020
756a48b
Merge pull request #1875 from kevindew/stylelint-config-gds
Sep 14, 2020
f5b4ce4
Remove sass lint
Aug 5, 2020
22c814e
Remove outdated docs on gulp:lint task
Aug 21, 2020
df45117
Remove old sass-lint disable rules
Aug 5, 2020
316b429
Update docs
Aug 5, 2020
6c92543
Tweak font-faces file to appease linter
Aug 5, 2020
0bd7651
Add test for copyright notice
Aug 25, 2020
cf5be78
Merge pull request #1902 from alphagov/remove-sass-lint
Sep 14, 2020
af2e947
Merge pull request #1922 from alphagov/adding-hidden-yaml-examples
hannalaakso Sep 15, 2020
3f0d09d
Small update to publishing doc
hannalaakso Sep 15, 2020
1d0d4db
Merge pull request #1956 from alphagov/small-update-publishing-doc
hannalaakso Sep 17, 2020
3a7d188
Remove duplicate $_govuk-colour-palette-legacy
Sep 17, 2020
1c483ee
Merge pull request #1959 from alphagov/remove-duplicate-legacy-colour…
Sep 17, 2020
5e251ff
Merger navody-frontend with upstream gov uk
Sep 19, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove duplication of 'pull request' in changelog
  • Loading branch information
m-green committed Jun 1, 2020
commit abd8887eb21454409db5a03a0287ba272efa67dd
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ This was added in [pull request #1807: Warn if importing core, overrides without

We’ve made fixes to GOV.UK Frontend in the following pull requests:

- [pull request #1778: Fix accordion underline hover state being removed when hovering plus/minus symbol](https://github.com/alphagov/govuk-frontend/pull/1778)
- [pull request #1765: Import textarea from character count](https://github.com/alphagov/govuk-frontend/pull/1765)
- [pull request #1753: Make backlink arrow consistent with breadcrumb component](https://github.com/alphagov/govuk-frontend/pull/1753)
- [pull request #1796: Standardise accordion section headings font size (reduce height of section headings on mobile)](https://github.com/alphagov/govuk-frontend/pull/1796)
- [#1778: Fix accordion underline hover state being removed when hovering plus/minus symbol](https://github.com/alphagov/govuk-frontend/pull/1778)
- [#1765: Import textarea from character count](https://github.com/alphagov/govuk-frontend/pull/1765)
- [#1753: Make backlink arrow consistent with breadcrumb component](https://github.com/alphagov/govuk-frontend/pull/1753)
- [#1796: Standardise accordion section headings font size (reduce height of section headings on mobile)](https://github.com/alphagov/govuk-frontend/pull/1796)


## 3.6.0 (Feature release)
Expand Down