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.

Sign up for GitHub

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

Jump to bottom

Govuk-frontend #591

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Govuk-frontend #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d605e52
Govuk-frontend updated
BarryGibney Sep 24, 2024
1a486f9
Merge branch 'dev' into Govuk-frontend
BarryGibney Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Web/Edubase.Web.UI/Assets/Sass/GiasForms/_gias-input-errors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// mapping of the input error styling over the razor className
.input-validation-error {
border: $govuk-border-width-form-element-error solid $govuk-error-colour;
border: $govuk-border-width-form-element solid $govuk-error-colour;

&:focus {
border-color: $govuk-input-border-colour;
Expand All @@ -12,7 +12,7 @@
.govuk-input,
.govuk-select,
.govuk-textarea {
border: $govuk-border-width-form-element-error solid $govuk-error-colour;
border: $govuk-border-width-form-element solid $govuk-error-colour;

&:focus {
border-color: $govuk-input-border-colour;
Expand All @@ -21,7 +21,7 @@
}
// LA searches
.la-id-target {
border: $govuk-border-width-form-element-error solid $govuk-error-colour;
border: $govuk-border-width-form-element solid $govuk-error-colour;

.govuk-input {
border: none;
Expand Down
18 changes: 9 additions & 9 deletions Web/Edubase.Web.UI/Assets/Sass/govuk-core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
$govuk-global-styles: true;

@import "GiasHelpers/all";
@import "node_modules/govuk-frontend/govuk/base";
@import "node_modules/govuk-frontend/govuk/core/all";
@import "node_modules/govuk-frontend/govuk/objects/all";
@import "node_modules/govuk-frontend/govuk/components/footer/index";
@import "node_modules/govuk-frontend/govuk/components/header/index";
@import "node_modules/govuk-frontend/govuk/components/phase-banner/index";
@import "node_modules/govuk-frontend/govuk/components/skip-link/index";
@import "node_modules/govuk-frontend/govuk/utilities/all";
@import "node_modules/govuk-frontend/govuk/overrides/all";
@import "govuk-frontend/govuk/base";
@import "govuk-frontend/govuk/core/all";
@import "govuk-frontend/govuk/objects/all";
@import "govuk-frontend/govuk/components/footer/index";
@import "govuk-frontend/govuk/components/header/index";
@import "govuk-frontend/govuk/components/phase-banner/index";
@import "govuk-frontend/govuk/components/skip-link/index";
@import "govuk-frontend/govuk/utilities/all";
@import "govuk-frontend/govuk/overrides/all";
63 changes: 32 additions & 31 deletions Web/Edubase.Web.UI/Assets/Sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,39 @@ $govuk-global-styles: true;

@import "GiasHelpers/all";
//@import "node_modules/govuk-frontend/govuk/all";
@import "node_modules/govuk-frontend/govuk/base";
@import "govuk-frontend/govuk/base";
//
@import "node_modules/govuk-frontend/govuk/core/all";
@import "node_modules/govuk-frontend/govuk/objects/all";
@import "node_modules/govuk-frontend/govuk/components/footer/index";
@import "node_modules/govuk-frontend/govuk/components/header/index";
@import "node_modules/govuk-frontend/govuk/components/skip-link/index";
@import "node_modules/govuk-frontend/govuk/components/checkboxes/index";
@import "node_modules/govuk-frontend/govuk/components/radios/index";
@import "node_modules/govuk-frontend/govuk/components/button/index";
@import "node_modules/govuk-frontend/govuk/components/label/index";
@import "node_modules/govuk-frontend/govuk/components/select/index";
@import "node_modules/govuk-frontend/govuk/components/file-upload/index";
@import "node_modules/govuk-frontend/govuk/components/fieldset";
@import "node_modules/govuk-frontend/govuk/components/phase-banner/index";
@import "node_modules/govuk-frontend/govuk/components/input";
@import "node_modules/govuk-frontend/govuk/components/date-input/index";
@import "node_modules/govuk-frontend/govuk/components/textarea/index";
@import "node_modules/govuk-frontend/govuk/components/error-summary/index";
@import "node_modules/govuk-frontend/govuk/components/error-message/index";
@import "node_modules/govuk-frontend/govuk/components/summary-list/index";
@import "node_modules/govuk-frontend/govuk/components/accordion/index";
@import "node_modules/govuk-frontend/govuk/components/breadcrumbs/index";
@import "node_modules/govuk-frontend/govuk/components/back-link/index";
@import "node_modules/govuk-frontend/govuk/components/details/index";
@import "node_modules/govuk-frontend/govuk/components/table/index";
@import "node_modules/govuk-frontend/govuk/components/warning-text/index";
@import "node_modules/govuk-frontend/govuk/components/notification-banner/index";
@import "node_modules/govuk-frontend/govuk/components/cookie-banner/index";
@import "node_modules/govuk-frontend/govuk/utilities/all";
@import "node_modules/govuk-frontend/govuk/overrides/all";
@import "node_modules/govuk-frontend/govuk/components/inset-text";
@import "govuk-frontend/govuk/core/all";
@import "govuk-frontend/govuk/objects/all";
@import "govuk-frontend/govuk/components/footer/index";
@import "govuk-frontend/govuk/components/header/index";
@import "govuk-frontend/govuk/components/skip-link/index";
@import "govuk-frontend/govuk/components/checkboxes/index";
@import "govuk-frontend/govuk/components/radios/index";
@import "govuk-frontend/govuk/components/button/index";
@import "govuk-frontend/govuk/components/label/index";
@import "govuk-frontend/govuk/components/select/index";
@import "govuk-frontend/govuk/components/file-upload/index";
@import "govuk-frontend/govuk/components/fieldset";
@import "govuk-frontend/govuk/components/phase-banner/index";
@import "govuk-frontend/govuk/components/input";
@import "govuk-frontend/govuk/components/date-input/index";
@import "govuk-frontend/govuk/components/textarea/index";
@import "govuk-frontend/govuk/components/error-summary/index";
@import "govuk-frontend/govuk/components/error-message/index";
@import "govuk-frontend/govuk/components/summary-list/index";
@import "govuk-frontend/govuk/components/accordion/index";
@import "govuk-frontend/govuk/components/breadcrumbs/index";
@import "govuk-frontend/govuk/components/back-link/index";
@import "govuk-frontend/govuk/components/details/index";
@import "govuk-frontend/govuk/components/table/index";
@import "govuk-frontend/govuk/components/warning-text/index";
@import "govuk-frontend/govuk/components/notification-banner/index";
@import "govuk-frontend/govuk/components/cookie-banner/index";
@import "govuk-frontend/govuk/utilities/all";
@import "govuk-frontend/govuk/overrides/all";
@import "govuk-frontend/govuk/components/inset-text";
@import "govuk-frontend/govuk/settings/all";
// GIAS specifics
@import "GiasGovukOverrides/all";
@import "GiasHelpers/gias-display";
Expand Down
2 changes: 1 addition & 1 deletion Web/Edubase.Web.UI/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Web/Edubase.Web.UI/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"axios": "^1.4.0",
"extend": "^3.0.2",
"glob": "^7.1.6",
"govuk-frontend": "^3.12.0",
"govuk-frontend": "^3.15.0",
"jquery": "^3.6.0",
"moment": "^2.29.1"
}
Expand Down
11 changes: 10 additions & 1 deletion Web/Edubase.Web.UI/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,16 @@ const config = {
}
}
},
{loader: 'sass-loader'}
{
loader: 'sass-loader',
options: {
sassOptions: {
includePaths: [
path.resolve(__dirname, 'node_modules')
],
},
},
},
],
},
{
Expand Down
Loading