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

Bump template and toolkit #801

merged 3 commits into from Jun 6, 2016

Bump template and toolkit #801

merged 3 commits into from Jun 6, 2016


Copy link

@fofr fofr commented May 27, 2016

  • Updates the footer-categories class to work with new grid by extending .grid-row and removing side padding. This is now like-for-like with live.

Update govuk_frontend_toolkit to 4.12.0


Increase button padding to match padding from GOV.UK elements. If you have UI which depends on the padding set by the button mixin in the frontend toolkit and this is not overridden by button padding set by GOV.UK elements, this change will affect it.


Remove the GDS-Logo font-face definition
Move the @Viewport statements to govuk_template. If you upgrade to this version of govuk_frontend_toolkit and you’re also using govuk_template you’ll need to upgrade that to at least 0.17.2 to maintain compatibility with desktop IE10 in snap mode.

Update govuk_template to 0.17.3


Fix bug with heading colours in footer


Fix a bug with the skip-to-content link and iOS Voiceover
Migrate @Viewport statement from govuk_frontend_toolkit


Reduce file size of template: removes HTML comments, type attributes on scripts, and uses HTML5 charset declaration.
Switch external link media query to be mobile first
Sass file cleanups
Replace old grid mixins with newer grid from frontend toolkit
Remove duplicate grey variables

fofr added 2 commits May 26, 2016
The footer was switched to the new grid helpers in govuk_template
0.17.1. This breaks the alignment of the text.

* Remove side padding that now comes as standard
* Add grid row class for correct alignment
@fofr fofr mentioned this pull request May 27, 2016
Copy link
Contributor Author

@fofr fofr commented May 27, 2016

This still has the peculiar double meta charset issue:

<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8">

This doesn't break anything, and I think it's worth making the updates to get the latest changes in. This should be investigated separately, and probably involves some obscure Rails magic. cc @boffbowsh

With the toolkits bump it includes updates to buttons which improve
the padding on buttons, GOV.UK already includes overrides to the previous
padding of buttons so this commit adds a note to remove this as part of
a wider review in favour of the padding now used in the toolkit
Copy link

@nickcolley nickcolley commented Jun 6, 2016

I've added a commit based on a discussion offline with @dsingleton that describes what we need to refactor in addition to this bump later on.

@dsingleton dsingleton merged commit 9cac7cb into master Jun 6, 2016
1 check passed
1 check passed
default "Build #1109 succeeded on Jenkins"
@dsingleton dsingleton deleted the bump-template-toolkit branch Jun 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.