Merge pull request #3125 from TechnologyEnhancedLearning/DLS-Release-v1.2.0

Dls release v1.2.0 to DEV

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Styles/layout.scss

@@ -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;
   }
 }
 

DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml

@@ -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">
@@ -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) />