Skip to content

Commit

Permalink
Merge pull request #2461 from alphagov/dependabot/npm_and_yarn/stylel…
Browse files Browse the repository at this point in the history
…int-and-stylelint-config-gds-14.9.1

Bump stylelint and stylelint-config-gds
  • Loading branch information
AgaDufrat authored Jun 20, 2022
2 parents 9092f2e + 774ce47 commit 84f64c5
Show file tree
Hide file tree
Showing 7 changed files with 328 additions and 928 deletions.
164 changes: 82 additions & 82 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,95 +5,95 @@ $govuk-use-legacy-palette: false;
$govuk-new-link-styles: true;

// Components from govuk_publishing_components gem
@import 'govuk_publishing_components/govuk_frontend_support';
@import 'govuk_publishing_components/component_support';
@import "govuk_publishing_components/govuk_frontend_support";
@import "govuk_publishing_components/component_support";

@import 'govuk_publishing_components/components/accordion';
@import 'govuk_publishing_components/components/attachment';
@import 'govuk_publishing_components/components/back-link';
@import 'govuk_publishing_components/components/big-number';
@import 'govuk_publishing_components/components/breadcrumbs';
@import 'govuk_publishing_components/components/button';
@import 'govuk_publishing_components/components/contents-list';
@import 'govuk_publishing_components/components/contextual-sidebar';
@import 'govuk_publishing_components/components/details';
@import 'govuk_publishing_components/components/devolved-nations';
@import 'govuk_publishing_components/components/document-list';
@import 'govuk_publishing_components/components/error-message';
@import 'govuk_publishing_components/components/error-summary';
@import 'govuk_publishing_components/components/feedback';
@import 'govuk_publishing_components/components/fieldset';
@import 'govuk_publishing_components/components/govspeak';
@import 'govuk_publishing_components/components/govspeak-html-publication';
@import 'govuk_publishing_components/components/heading';
@import 'govuk_publishing_components/components/hint';
@import 'govuk_publishing_components/components/image-card';
@import 'govuk_publishing_components/components/input';
@import 'govuk_publishing_components/components/inset-text';
@import 'govuk_publishing_components/components/inverse-header';
@import 'govuk_publishing_components/components/label';
@import 'govuk_publishing_components/components/lead-paragraph';
@import 'govuk_publishing_components/components/metadata';
@import 'govuk_publishing_components/components/notice';
@import 'govuk_publishing_components/components/organisation-logo';
@import 'govuk_publishing_components/components/phase-banner';
@import 'govuk_publishing_components/components/previous-and-next-navigation';
@import 'govuk_publishing_components/components/print-link';
@import 'govuk_publishing_components/components/radio';
@import 'govuk_publishing_components/components/related-navigation';
@import 'govuk_publishing_components/components/share-links';
@import 'govuk_publishing_components/components/single-page-notification-button';
@import 'govuk_publishing_components/components/step-by-step-nav';
@import 'govuk_publishing_components/components/step-by-step-nav-header';
@import 'govuk_publishing_components/components/step-by-step-nav-related';
@import 'govuk_publishing_components/components/subscription-links';
@import 'govuk_publishing_components/components/success-alert';
@import 'govuk_publishing_components/components/title';
@import 'govuk_publishing_components/components/translation-nav';
@import 'govuk_publishing_components/components/skip-link';
@import "govuk_publishing_components/components/accordion";
@import "govuk_publishing_components/components/attachment";
@import "govuk_publishing_components/components/back-link";
@import "govuk_publishing_components/components/big-number";
@import "govuk_publishing_components/components/breadcrumbs";
@import "govuk_publishing_components/components/button";
@import "govuk_publishing_components/components/contents-list";
@import "govuk_publishing_components/components/contextual-sidebar";
@import "govuk_publishing_components/components/details";
@import "govuk_publishing_components/components/devolved-nations";
@import "govuk_publishing_components/components/document-list";
@import "govuk_publishing_components/components/error-message";
@import "govuk_publishing_components/components/error-summary";
@import "govuk_publishing_components/components/feedback";
@import "govuk_publishing_components/components/fieldset";
@import "govuk_publishing_components/components/govspeak";
@import "govuk_publishing_components/components/govspeak-html-publication";
@import "govuk_publishing_components/components/heading";
@import "govuk_publishing_components/components/hint";
@import "govuk_publishing_components/components/image-card";
@import "govuk_publishing_components/components/input";
@import "govuk_publishing_components/components/inset-text";
@import "govuk_publishing_components/components/inverse-header";
@import "govuk_publishing_components/components/label";
@import "govuk_publishing_components/components/lead-paragraph";
@import "govuk_publishing_components/components/metadata";
@import "govuk_publishing_components/components/notice";
@import "govuk_publishing_components/components/organisation-logo";
@import "govuk_publishing_components/components/phase-banner";
@import "govuk_publishing_components/components/previous-and-next-navigation";
@import "govuk_publishing_components/components/print-link";
@import "govuk_publishing_components/components/radio";
@import "govuk_publishing_components/components/related-navigation";
@import "govuk_publishing_components/components/share-links";
@import "govuk_publishing_components/components/single-page-notification-button";
@import "govuk_publishing_components/components/step-by-step-nav";
@import "govuk_publishing_components/components/step-by-step-nav-header";
@import "govuk_publishing_components/components/step-by-step-nav-related";
@import "govuk_publishing_components/components/subscription-links";
@import "govuk_publishing_components/components/success-alert";
@import "govuk_publishing_components/components/title";
@import "govuk_publishing_components/components/translation-nav";
@import "govuk_publishing_components/components/skip-link";

// government-frontend mixins
@import 'mixins/margins';
@import 'mixins/white-links';
@import 'mixins/typography';
@import "mixins/margins";
@import "mixins/white-links";
@import "mixins/typography";

// helpers for common page elements
@import 'helpers/sidebar-with-body';
@import 'helpers/organisation-links';
@import 'helpers/organisation-logos';
@import 'helpers/parts';
@import 'helpers/add-title-margin';
@import 'helpers/content-bottom-margin';
@import 'helpers/publisher-metadata-with-logo';
@import 'helpers/attachments';
@import 'helpers/sticky-element-container';
@import "helpers/sidebar-with-body";
@import "helpers/organisation-links";
@import "helpers/organisation-logos";
@import "helpers/parts";
@import "helpers/add-title-margin";
@import "helpers/content-bottom-margin";
@import "helpers/publisher-metadata-with-logo";
@import "helpers/attachments";
@import "helpers/sticky-element-container";

// Components from this application
@import 'components/*';
@import "components/*";

// pages specific view imports
@import 'views/case-studies';
@import 'views/coming-soon';
@import 'views/html-publication';
@import 'views/statistics_announcement';
@import 'views/take-part';
@import 'views/topical-event-about-page';
@import 'views/unpublishing';
@import 'views/working-group';
@import 'views/detailed-guide';
@import 'views/publication';
@import 'views/document-collection';
@import 'views/fatality-notice';
@import 'views/statistical-data-set';
@import 'views/consultation';
@import 'views/speech';
@import 'views/world-location-news-article';
@import 'views/news-article';
@import 'views/corporate-information-page';
@import 'views/travel-advice';
@import "views/case-studies";
@import "views/coming-soon";
@import "views/html-publication";
@import "views/statistics_announcement";
@import "views/take-part";
@import "views/topical-event-about-page";
@import "views/unpublishing";
@import "views/working-group";
@import "views/detailed-guide";
@import "views/publication";
@import "views/document-collection";
@import "views/fatality-notice";
@import "views/statistical-data-set";
@import "views/consultation";
@import "views/speech";
@import "views/world-location-news-article";
@import "views/news-article";
@import "views/corporate-information-page";
@import "views/travel-advice";
@import "views/contact";
@import 'views/specialist-document';
@import 'views/answer';
@import 'views/help-page';
@import 'views/guide';
@import 'views/manual';
@import "views/specialist-document";
@import "views/answer";
@import "views/help-page";
@import "views/guide";
@import "views/manual";
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/_download-link.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

.app-c-download-link__icon {
margin-right: .5em;
height: 1.31578947368em; // 25 / 19
width: 1.31578947368em;
height: 1.3158em; // 25 / 19
width: 1.3158em;
vertical-align: middle;
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/helpers/_px-to-em.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Convert pixels to em
@function em($value, $app-context-font-size) {
@if (unitless($value)) {
@if unitless($value) {
$value: $value * 1px;
}
@if (unitless($app-context-font-size)) {
@if unitless($app-context-font-size) {
$app-context-font-size: $app-context-font-size * 1px;
}
@return $value / $app-context-font-size * 1em;
Expand Down
20 changes: 10 additions & 10 deletions app/assets/stylesheets/print.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import 'govuk_publishing_components/govuk_frontend_support';
@import 'govuk_publishing_components/components/print/button';
@import 'govuk_publishing_components/components/print/contents-list';
@import 'govuk_publishing_components/components/print/govspeak';
@import 'govuk_publishing_components/components/print/govspeak-html-publication';
@import 'govuk_publishing_components/components/print/step-by-step-nav';
@import 'govuk_publishing_components/components/print/step-by-step-nav-header';
@import 'govuk_publishing_components/components/print/title';
@import 'print/html-publication';
@import 'print/language_support';
@import "govuk_publishing_components/govuk_frontend_support";
@import "govuk_publishing_components/components/print/button";
@import "govuk_publishing_components/components/print/contents-list";
@import "govuk_publishing_components/components/print/govspeak";
@import "govuk_publishing_components/components/print/govspeak-html-publication";
@import "govuk_publishing_components/components/print/step-by-step-nav";
@import "govuk_publishing_components/components/print/step-by-step-nav-header";
@import "govuk_publishing_components/components/print/title";
@import "print/html-publication";
@import "print/language_support";
10 changes: 5 additions & 5 deletions app/assets/stylesheets/views/_manual.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@include govuk-clearfix;

background: $govuk-brand-colour;
color: govuk-colour('white');
color: govuk-colour("white");
margin: 0;
padding-bottom: govuk-spacing(6);
padding-top: govuk-spacing(6);
Expand All @@ -30,15 +30,15 @@
}

a {
color: govuk-colour('white');
color: govuk-colour("white");

&:focus {
@include govuk-focused-text;
}
}

&.hmrc {
background: govuk-organisation-colour('hm-revenue-customs');
background: govuk-organisation-colour("hm-revenue-customs");
}
}

Expand All @@ -59,7 +59,7 @@
list-style: none;

&:hover {
background-color: govuk-colour("light-grey", $legacy: 'grey-4');
background-color: govuk-colour("light-grey", $legacy: "grey-4");
}

&:last-child {
Expand Down Expand Up @@ -106,7 +106,7 @@
.section-title {
@include govuk-text-colour;
@include govuk-font($size: 24, $weight: bold);
@include govuk-responsive-margin(4, 'bottom');
@include govuk-responsive-margin(4, "bottom");
}
}

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"standardx": "^7.0.0",
"stylelint": "^13.13.1",
"stylelint-config-gds": "^0.1.0"
"stylelint": "^14.9.1",
"stylelint-config-gds": "^0.2.0"
}
}
Loading

0 comments on commit 84f64c5

Please sign in to comment.