Skip to content

Commit

Permalink
Merge branch 'master' into minor-fix-breadcrumbs-classes
Browse files Browse the repository at this point in the history
  • Loading branch information
frankieroberto authored Jan 13, 2021
2 parents 06b54e1 + 6434b50 commit efef01d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
We’ve made fixes to GOV.UK Frontend in the following pull requests:

- [#2080: Fix JavaScript error when character count ID starts with a number](https://github.com/alphagov/govuk-frontend/pull/2080) - thanks to [@josef-vlach](https://github.com/josef-vlach) for reporting this issue.
- [#2092: Use tabular numbers for character count message](https://github.com/alphagov/govuk-frontend/pull/2092)
- [#2093: Only output space after breadcrumbs class if there’s an additional class](https://github.com/alphagov/govuk-frontend/pull/2093) – thanks to [@frankieroberto](https://github.com/frankieroberto) for contributing this.

## 3.10.2 (Patch release)
Expand Down
1 change: 1 addition & 0 deletions src/govuk/components/character-count/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
}

.govuk-character-count__message {
@include govuk-font($size: false, $tabular: true);
margin-top: 0;
margin-bottom: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/govuk/components/details/details.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ examples:
summaryText: Expand me
attributes:
data-some-data-attribute: i-love-data
another-attribute: true
another-attribute: foo
2 changes: 1 addition & 1 deletion src/govuk/components/details/template.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@ describe('Details', () => {

const $component = $('.govuk-details')
expect($component.attr('data-some-data-attribute')).toEqual('i-love-data')
expect($component.attr('another-attribute')).toEqual('true')
expect($component.attr('another-attribute')).toEqual('foo')
})
})

0 comments on commit efef01d

Please sign in to comment.