Skip to content

Commit

Permalink
Update with new toolkits
Browse files Browse the repository at this point in the history
Brings in the latest govuk_frontend_toolkit available
on NPM, and the latest digitalmarketplace toolkit.

Also:
- removes external link styles, as these will no longer compile
- removes custom focused/selected classes for radios/checks
  • Loading branch information
pcraig3 committed Feb 22, 2017
1 parent a302c9e commit f4004f4
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 30 deletions.
7 changes: 2 additions & 5 deletions app/assets/javascripts/_selection-buttons.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
;(function(GOVUK, GDM) {
(function(GOVUK, GDM) {

GDM.selectionButtons = function() {

if (!GOVUK.SelectionButtons) return;

new GOVUK.SelectionButtons('.selection-button input', {
'focusedClass' : 'selection-button-focused',
'selectedClass' : 'selection-button-selected'
});
new GOVUK.SelectionButtons('.selection-button input');

new GOVUK.ShowHideContent().init();

Expand Down
21 changes: 0 additions & 21 deletions app/assets/scss/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -102,25 +102,4 @@
font-size: 16px;
}
}

.footer-categories a[rel="external"],
.footer-meta .footer-meta-inner a[rel="external"] {
/* There is no mixin for a 16px black link with a font weight of normal in the govuk toolkit hence the variant below */
&:after {
content: "\A0\A0\A0\A0\A0";
background-position: right 3px;
background-image: file-url("external-links/external-link-black-12x12.png");
background-repeat: no-repeat;

@include device-pixel-ratio() {
background-image: file-url("external-links/external-link-black-24x24.png");
background-size: 12px 12px;
}
}

&:hover:after {
background-position: right 3px;
}
}

}
5 changes: 3 additions & 2 deletions app/assets/scss/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ $path: "/suppliers/static/images/";
@import "shared_scss/_dmspeak.scss";

/* Blocks shared between multiple selectors */
@import "shared_placeholders/_temporary-messages.scss";
@import "shared_placeholders/_dm-typography.scss";
@import "toolkit/shared_placeholders/_temporary-messages.scss";
@import "toolkit/shared_placeholders/_placeholders.scss";
@import "toolkit/shared_placeholders/_dm-typography.scss";

#wrapper, .wrapper {
@extend %site-width-container;
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"jquery": "1.11.2",
"hogan": "3.0.2",
"jquery-details": "https://github.com/mathiasbynens/jquery-details/archive/v0.1.0.tar.gz",
"digitalmarketplace-frontend-toolkit": "https://github.com/alphagov/digitalmarketplace-frontend-toolkit.git#v19.3.1",
"digitalmarketplace-frontend-toolkit": "https://github.com/alphagov/digitalmarketplace-frontend-toolkit.git#v20.0.0",
"govuk_template": "https://github.com/alphagov/govuk_template/releases/download/v0.19.2/jinja_govuk_template-0.19.2.tgz",
"digitalmarketplace-frameworks": "https://github.com/alphagov/digitalmarketplace-frameworks.git#5.15.2"
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"bower": "1.5.2",
"del": "1.1.1",
"govuk_frontend_toolkit": "4.18.0",
"govuk_frontend_toolkit": "5.0.3",
"gulp": "3.8.7",
"gulp-filelog": "0.4.1",
"gulp-include": "1.1.1",
Expand Down

0 comments on commit f4004f4

Please sign in to comment.