Skip to content

Dls release v1.2.0 to DEV #3125

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

Merged
merged 4 commits into from
Feb 13, 2025
Merged

Dls release v1.2.0 to DEV #3125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a53ea1f
moves skip link outside of header for consistency with nhsuk
kevwhitt-hee Feb 12, 2025
a5560ba
Removes active nav bottom border indicator
kevwhitt-hee Feb 12, 2025
42a4e7d
TD-5346 Fixes mobile header service name styling using overrides
kevwhitt-hee Feb 13, 2025
f10e104
Merge pull request #3124 from TechnologyEnhancedLearning/Develop/Feat…
kevwhitt-hee Feb 13, 2025
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
26 changes: 22 additions & 4 deletions DigitalLearningSolutions.Web/Styles/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,32 @@ footer {
}

.nhsuk-header__navigation-item.selected {
@include mq($from: large-desktop) {
box-shadow: inset 0 -4px 0 #d8dde0;
a {
font-weight: bold;
}
}

.nhsuk-header__logo {
@include mq($until: large-desktop) {
a {
font-weight: bold;
max-width: unset;

.nhsuk-header__link--service {
align-items: center;
display: flex;
-ms-flex-align: center;
margin-bottom: 0;
width: auto;
}

.nhsuk-header__service-name {
padding-left: nhsuk-spacing(3);
max-width: unset;
}
}
}
.nhsuk-navigation-container {
@include mq($until: tablet) {
margin-top: unset;
}
}

Expand Down
5 changes: 2 additions & 3 deletions DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
{
@await Html.PartialAsync("~/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml")
}
<script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
<a class="nhsuk-skip-link" href="#maincontent">Skip to main content</a>
<div id="pagewrapper">
<header class="nhsuk-header nhsuk-header--organisation nhsuk-header--white" role="banner">
<script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
<partial name="_CookieConsentPartial" />
<a class="nhsuk-skip-link" href="#maincontent">Skip to main content</a>
@if (Configuration["ShowAlertBanner"] == "True")
{
<div class="dls-alert-banner no-print">
Expand Down Expand Up @@ -153,7 +153,6 @@
@{
var visualSeparatorNoNavBar = (bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] == true ? "visual-separator-no-nav-bar" : string.Empty;
}
<div class="visual-separator @visualSeparatorNoNavBar"></div>

<feature name="@(FeatureFlags.UserFeedbackBar)">
<partial name="_UserFeedbackBarPartial" model=@(userResearchUrl) />
Expand Down
Loading