Skip to content

Commit 2e1d040

Browse files
Phil-NHSPhil-NHS
committed
TD-6277 Header Text position and colour
1 parent f538492 commit 2e1d040

File tree

4 files changed

+27
-42
lines changed

4 files changed

+27
-42
lines changed

‎DigitalLearningSolutions.Web/Scripts/spec/learningMenu/fullscreen.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable @typescript-eslint/no-non-null-assertion */
22
import { JSDOM } from 'jsdom';
33
import { exitFullscreen, enterFullscreen } from '../../learningMenu/fullscreen';
4-
4+
/*qqqq what is this page do i need to update it*/
55
describe('enterFullscreen', () => {
66
it('should show the exit fullscreen button', () => {
77
// Given

‎DigitalLearningSolutions.Web/Styles/nhsuk.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ body:not(.js-enabled) {
7070
margin-bottom: 0;
7171
}
7272

73-
/*Breaks mobile more expansion qqqq */
73+
/*Breaks mobile "more" expansion */
7474
/*nav, .nhsuk-header__navigation, #header-navigation {
7575
border-bottom: 0;
7676
}*/

‎DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,19 @@
5151
@await Html.PartialAsync("~/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml")
5252
}
5353
<script nonce="random772362">document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' nhsuk-frontend-supported' : '');</script>
54-
<a class="nhsuk-skip-link" href="#maincontent">Skip to main content</a>
54+
<a class="nhsuk-skip-link" href="#maincontent" data-module="nhsuk-skip-link">Skip to main content</a>
5555
<div id="pagewrapper">
56-
<header class="nhsuk-header nhsuk-header--transactional" role="banner">
57-
<div class="nhsuk-header__container">
58-
<div class="nhsuk-header__logo nhsuk-header__transactional--logo">
59-
<a class="nhsuk-header__link"
60-
href="/"
61-
aria-label="NHS homepage">
62-
<svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="NHS Logo" focusable="false" viewBox="0 0 40 16" height="40" width="100">
63-
<title>NHS</title>
64-
<path class="nhsuk-logo__background" fill="#005eb8" d="M0 0h40v16H0z"></path>
65-
<path class="nhsuk-logo__text" fill="#fff" d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"></path>
66-
<image src="https://assets.nhs.uk/images/nhs-logo.png" width="40" height="16" xlink:href=""></image>
67-
</svg>
68-
</a>
69-
<div class="nhsuk-header__transactional-service-name">
70-
<a class="nhsuk-header__transactional-service-name--link" href="/">@ViewData["SelfAssessmentTitle"]</a>
56+
<header class="nhsuk-header" role="banner" data-module="nhsuk-header">
57+
<div class="nhsuk-header__container nhsuk-width-container">
58+
<div class="nhsuk-header__service">
59+
<a class="nhsuk-header__service-logo" href="/">
60+
<svg class="nhsuk-header__logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 80" height="40" width="100" focusable="false" role="img" aria-label="NHS">
61+
<title>NHS</title>
62+
<path fill="currentcolor" d="M200 0v80H0V0h200Zm-27.5 5.5c-14.5 0-29 5-29 22 0 10.2 7.7 13.5 14.7 16.3l.7.3c5.4 2 10.1 3.9 10.1 8.4 0 6.5-8.5 7.5-14 7.5s-12.5-1.5-16-3.5L135 70c5.5 2 13.5 3.5 20 3.5 15.5 0 32-4.5 32-22.5 0-19.5-25.5-16.5-25.5-25.5 0-5.5 5.5-6.5 12.5-6.5a35 35 0 0 1 14.5 3l4-13.5c-4.5-2-12-3-20-3Zm-131 2h-22l-14 65H22l9-45h.5l13.5 45h21.5l14-65H64l-9 45h-.5l-13-45Zm63 0h-18l-13 65h17l6-28H117l-5.5 28H129l13.5-65H125L119.5 32h-20l5-24.5Z" />
63+
</svg>
64+
<span class="nhsuk-header__service-name">@ViewData["SelfAssessmentTitle"]</span>
7165
<sup class="header-beta">Beta</sup>
72-
</div>
66+
</a>
7367
</div>
7468
</div>
7569
<feature name="@(FeatureFlags.UserFeedbackBar)">

‎DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
@await Html.PartialAsync("~/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml")
7272
}
7373
<script nonce="random772362">document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' nhsuk-frontend-supported' : '');</script>
74-
<a class="nhsuk-skip-link" href="#maincontent">Skip to main content</a>
74+
<a class="nhsuk-skip-link" href="#maincontent" data-module="nhsuk-skip-link">Skip to main content</a>
7575
<div id="pagewrapper">
7676
<header class="nhsuk-header nhsuk-header--white" role="banner" data-module="nhsuk-header">
7777
<partial name="_CookieConsentPartial" />
@@ -88,27 +88,23 @@
8888

8989
<div class="nhsuk-header__container nhsuk-width-container">
9090
<div class="nhsuk-header__service">
91-
@*qqqq <div class="nhsuk-header__transactional--logo nhsuk-header__logo"> *@
92-
<a class="nhsuk-header__link"
93-
href="@(ViewData[LayoutViewDataKeys.HeaderPath] ?? Configuration["AppRootPath"] + "/Home")"
94-
aria-label="NHS Digital Learning Solutions - @(ViewData[LayoutViewDataKeys.HeaderPathName] ?? "Landing Page")">
95-
<svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="NHS Logo" focusable="false" viewBox="0 0 40 16" height="40" width="100">
91+
<a class="nhsuk-header__service-logo"
92+
href="@(ViewData[LayoutViewDataKeys.HeaderPath] ?? Configuration["AppRootPath"] + "/Home")"
93+
aria-label="NHS Digital Learning Solutions - @(ViewData[LayoutViewDataKeys.HeaderPathName] ?? "Landing Page")"
94+
>
95+
<svg class="nhsuk-header__logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 80" height="40" width="100" focusable="false" role="img" aria-label="NHS">
9696
<title>NHS</title>
97-
<path class="nhsuk-logo__background" fill="#005eb8" d="M0 0h40v16H0z"></path>
98-
<path class="nhsuk-logo__text" fill="#fff" d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"></path>
99-
<image src="https://assets.nhs.uk/images/nhs-logo.png" width="40" height="16" xlink:href=""></image>
97+
<path fill="currentcolor" d="M200 0v80H0V0h200Zm-27.5 5.5c-14.5 0-29 5-29 22 0 10.2 7.7 13.5 14.7 16.3l.7.3c5.4 2 10.1 3.9 10.1 8.4 0 6.5-8.5 7.5-14 7.5s-12.5-1.5-16-3.5L135 70c5.5 2 13.5 3.5 20 3.5 15.5 0 32-4.5 32-22.5 0-19.5-25.5-16.5-25.5-25.5 0-5.5 5.5-6.5 12.5-6.5a35 35 0 0 1 14.5 3l4-13.5c-4.5-2-12-3-20-3Zm-131 2h-22l-14 65H22l9-45h.5l13.5 45h21.5l14-65H64l-9 45h-.5l-13-45Zm63 0h-18l-13 65h17l6-28H117l-5.5 28H129l13.5-65H125L119.5 32h-20l5-24.5Z" />
10098
</svg>
101-
</a>
102-
<div class="nhsuk-header__transactional-service-name">
103-
<a class="nhsuk-header__transactional-service-name--link" href="@(ViewData[LayoutViewDataKeys.HeaderPath] ?? Configuration["AppRootPath"] + "/Home")">@(ViewData[LayoutViewDataKeys.HeaderPrefix] ?? "Digital Learning Solutions ")@(headerExtension)</a>
104-
@if (ViewData[LayoutViewDataKeys.Application] != null)
99+
<span class="nhsuk-header__service-name">@(ViewData[LayoutViewDataKeys.HeaderPrefix] ?? "Digital Learning Solutions ")@(headerExtension)</span>
100+
</a>
101+
@if (ViewData[LayoutViewDataKeys.Application] != null)
102+
{
103+
if (ViewData[LayoutViewDataKeys.Application].ToString() == "Framework Service" | ViewData[LayoutViewDataKeys.Application].ToString() == "Supervise")
105104
{
106-
if (ViewData[LayoutViewDataKeys.Application].ToString() == "Framework Service" | ViewData[LayoutViewDataKeys.Application].ToString() == "Supervise")
107-
{
108-
<sup class="header-beta header-beta--dark">Beta</sup>
109-
}
105+
<sup class="header-beta header-beta--dark">Beta</sup>
110106
}
111-
</div>
107+
}
112108
</div>
113109
<vc:logo customisation-id="@((int?)ViewData[LayoutViewDataKeys.CustomisationIdForHeaderLogo])" />
114110
</div>
@@ -147,11 +143,6 @@
147143
<li class="nhsuk-header__menu" hidden>
148144
<button class="nhsuk-header__menu-toggle nhsuk-header__navigation-link" id="toggle-menu" aria-expanded="false">
149145
<span class="nhsuk-u-visually-hidden">Browse </span>More
150-
@* qqqq try how it is in the template <span class="nhsuk-u-visually-hidden">Browse</span>
151-
More
152-
<svg class="nhsuk-icon nhsuk-icon__chevron-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
153-
<path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
154-
</svg> *@
155146
</button>
156147
</li>
157148
</ul>

0 commit comments

Comments
 (0)