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

UI updates #519

Merged
merged 23 commits into from
Oct 16, 2024
Merged

UI updates #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e8bf02b
Update govuk-frontend package to 5.6.0
Sep 13, 2024
95750d2
auto-updated packages as a result of updated govuk-fronted
Sep 13, 2024
2656954
font changed in _dfe-overrides.scss file
Sep 17, 2024
923e6e0
403 file font changed
Sep 17, 2024
41d1f31
502 file font changes
Sep 17, 2024
ef01356
blank comment added to test carriage return
Sep 17, 2024
40b5c30
blank comment added to test carriage return
Sep 17, 2024
d79c385
final font changes
Sep 20, 2024
a498aeb
back to top font size rectified
Sep 26, 2024
7dc6bd8
hero banner width changed to full-width
Oct 2, 2024
c7c6fae
h1 bottom margin set to 30px
Oct 9, 2024
ac1153d
Merge branch 'SWCD-2382-h1-container-width' into font-updates
Oct 9, 2024
3e9866c
feat: UI update branches merged
Oct 9, 2024
4305713
Merge branch 'next' into ui-updates
Maria-C1 Oct 9, 2024
6748854
Merge pull request #521 from DFE-Digital/next
mattb-hippo Oct 15, 2024
fa62f43
Merge branch 'next' into ui-updates
mattb-hippo Oct 16, 2024
82c75ef
update after merge of next
mattb-hippo Oct 16, 2024
9edd8ee
fixed whitespace
mattb-hippo Oct 16, 2024
98608ab
fix crlf
mattb-hippo Oct 16, 2024
e9f905e
restoring static HTML file
mattb-hippo Oct 16, 2024
267e40c
restoring static html file
mattb-hippo Oct 16, 2024
0f72481
removed spurious comment
mattb-hippo Oct 16, 2024
24f17a3
Merge remote-tracking branch 'origin/main' into ui-updates
mattb-hippo Oct 16, 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
2 changes: 1 addition & 1 deletion Childrens-Social-Care-CPD/Views/Shared/_HeroBanner.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<section class="app-section-beta app-section-beta__blue govuk-!-margin-bottom-8">
<div class="dfe-width-container">
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds-from-desktop">
<div class="govuk-grid-column-full">
<h1 class="body-header-font" data-testid="homepage-header">@Model.Title</h1>
<p class="govuk-body govuk-!-font-size-24 body-header-font">@Model.Text</p>
</div>
Expand Down
28 changes: 6 additions & 22 deletions Childrens-Social-Care-CPD/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 Childrens-Social-Care-CPD/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@ministryofjustice/frontend": "^1.8.0",
"dfe-frontend-alpha": "^1.0.1",
"govuk-frontend": "^5.2.0",
"govuk-frontend": "^5.6.0",
"jquery": "^3.7.0"
}
}
21 changes: 14 additions & 7 deletions Childrens-Social-Care-CPD/styles/scss/overrides/_dfe-overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* STANDARD COLOURS */
body, p, h1, h2, h3, h4, h5, h6, a, span, div, table, th, td, blockquote, li, dt, dd, tr {
font-family: BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif !important;
@import url('https://rsms.me/inter/inter.css');

/* STANDARD COLOURS */
* {
font-family: 'Inter', sans-serif !important;
}

.logo {
Expand Down Expand Up @@ -64,6 +66,11 @@ body, p, h1, h2, h3, h4, h5, h6, a, span, div, table, th, td, blockquote, li, dt
background-color: #003a69;
}

h1,
.dfe-heading-xl, .govuk-heading-xl {
margin-bottom: 30px !important
}

.govuk-header__container {
position: relative;
margin-bottom: -10px;
Expand Down Expand Up @@ -334,7 +341,7 @@ CONTENT TITLE BANNER

.gem-c-contents-list__title {
color: #0b0c0c;
font-family: "GDS Transport", arial, sans-serif;
font-family: 'Inter', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-weight: 400;
Expand All @@ -352,7 +359,7 @@ CONTENT TITLE BANNER

@media print {
.gem-c-contents-list__title {
font-family: sans-serif;
font-family: 'Inter', sans-serif;
}
}

Expand All @@ -373,7 +380,7 @@ CONTENT TITLE BANNER

.gem-c-contents-list__list, .gem-c-contents-list__nested-list {
color: #0b0c0c;
font-family: "GDS Transport", arial, sans-serif;
font-family: 'Inter', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-weight: 400;
Expand All @@ -393,7 +400,7 @@ CONTENT TITLE BANNER

@media print {
.gem-c-contents-list__list, .gem-c-contents-list__nested-list {
font-family: sans-serif;
font-family: 'Inter', sans-serif;
}
}

Expand Down
2 changes: 1 addition & 1 deletion Childrens-Social-Care-CPD/styles/scss/overrides/_mediaelement-player.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Reference: http://blog.rrwd.nl/2015/04/04/the-screen-reader-text-class-why-and-h
.mejs__container {
background: #000;
box-sizing: border-box;
font-family: 'Helvetica', Arial, serif;
font-family: 'Inter', sans-serif;
position: relative;
text-align: left;
text-indent: 0;
Expand Down
1 change: 1 addition & 0 deletions Childrens-Social-Care-CPD/styles/scss/overrides/_site.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@
/* Back to top component - styles taken from Help for Early Years */
.app-back-to-top {
margin-top: 60px;
font-size: 19px;
}

.app-back-to-top__icon {
Expand Down
Loading
Loading