Skip to content

Commit 5c44912

Browse files
authored
Merge pull request #3974 from nhsuk/update-frontend
Update NHS.UK frontend, use Sass module system
2 parents 20ce6b6 + e3a4714 commit 5c44912

64 files changed

Lines changed: 545 additions & 485 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/assets/stylesheets/_autocomplete.scss

Lines changed: 0 additions & 44 deletions
This file was deleted.

app/assets/stylesheets/_globals.scss

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/assets/stylesheets/_list.scss

Lines changed: 0 additions & 18 deletions
This file was deleted.

app/assets/stylesheets/_overrides.scss

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/assets/stylesheets/_panel.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/_summary-list.scss

Lines changed: 0 additions & 73 deletions
This file was deleted.

app/assets/stylesheets/_tabs.scss

Lines changed: 0 additions & 5 deletions
This file was deleted.

app/assets/stylesheets/_utilities.scss

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 6 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,10 @@
11
@use "sass:color";
22

3-
// Configure and import GOV.UK Frontend
4-
$govuk-font-family: "Frutiger W01", Arial, sans-serif;
5-
$govuk-border-colour: #d8dde0;
6-
$govuk-brand-colour: #005eb8;
7-
$govuk-error-colour: #d5281b;
8-
$govuk-success-colour: #007f3b;
9-
$govuk-global-styles: false;
10-
$govuk-new-organisation-colours: true;
11-
$govuk-assets-path: "/";
3+
// NHS.UK frontend components
4+
@forward "vendor/nhsuk-frontend";
125

13-
@import "govuk-frontend/dist/govuk/base";
14-
@import "govuk-frontend/dist/govuk/components/checkboxes";
15-
@import "govuk-frontend/dist/govuk/components/file-upload";
16-
@import "govuk-frontend/dist/govuk/components/notification-banner";
17-
@import "govuk-frontend/dist/govuk/components/pagination";
6+
// GOV.UK Frontend components
7+
@forward "vendor/govuk-frontend";
188

19-
// Configure and import NHS.UK Frontend
20-
$nhsuk-fonts-path: "/";
21-
$nhsuk-grid-widths: (
22-
one-quarter: 25%,
23-
one-third: 33.3333%,
24-
one-half: 50%,
25-
two-thirds: 66.6666%,
26-
three-quarters: 75%,
27-
full: 100%,
28-
filters: 30%,
29-
results: 70%,
30-
);
31-
32-
@import "nhsuk-frontend/packages/nhsuk";
33-
34-
// App options
35-
$app-page-width: 1100px;
36-
$color_app-dark-orange: color.scale(
37-
color.mix($color_nhsuk-red, $color_nhsuk-warm-yellow, 55%),
38-
$lightness: -10%
39-
);
40-
41-
// Helpers
42-
@import "helpers/link";
43-
44-
// Application components
45-
@import "action_list";
46-
@import "add_another";
47-
@import "autocomplete";
48-
@import "button";
49-
@import "button-group";
50-
@import "card";
51-
@import "count";
52-
@import "dev-tools";
53-
@import "environment";
54-
@import "file-upload";
55-
@import "filters";
56-
@import "globals";
57-
@import "grid";
58-
@import "header";
59-
@import "heading-group";
60-
@import "highlight";
61-
@import "list";
62-
@import "overrides";
63-
@import "panel";
64-
@import "password-input";
65-
@import "search-input";
66-
@import "secondary-navigation";
67-
@import "status";
68-
@import "summary-list";
69-
@import "table";
70-
@import "tabs";
71-
@import "tag";
72-
@import "typography";
73-
@import "utilities";
74-
75-
// Fix checkbox check sizing
76-
.nhsuk-checkboxes__label::after {
77-
box-sizing: border-box;
78-
}
79-
80-
// Ensure consistent margin for small fieldset legend
81-
.nhsuk-fieldset__legend--s {
82-
margin-bottom: nhsuk-spacing(2);
83-
}
9+
// App-specific components
10+
@forward "components";

app/assets/stylesheets/_action_list.scss renamed to app/assets/stylesheets/components/_action-list.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
@use "../vendor/nhsuk-frontend" as *;
2+
13
.app-action-list {
24
display: flex;
35
padding: 0;
46

57
@include nhsuk-font-size(19);
6-
@include nhsuk-responsive-margin(7, "bottom");
8+
@include nhsuk-responsive-margin(5, "bottom");
79

810
.nhsuk-table__cell & {
911
margin-bottom: 0;

0 commit comments

Comments
 (0)