Merge pull request #819 from SkillsFundingAgency/release/live-service…

…/release-41.6-branding-3

Merge Release 41.6 (Branding 3) to master

src/gds_service_toolkit/assets/src/frontend/sass/dysac/_results.scss

@@ -160,13 +160,13 @@
       clear: both;
       margin-bottom: govuk-px-to-rem(8);
       width: calc(100% - 8px);
-      border-left: 4px solid $app-turquoise;
-      border-right: 4px solid $app-turquoise;
+      border-left: 4px solid #0b0c0c;
+      border-right: 4px solid #0b0c0c;
       padding-top: govuk-px-to-rem(4);
       padding-bottom: govuk-px-to-rem(4);
 
       hr {
-        border: 2px solid $app-turquoise;
+        border: 2px solid #0b0c0c;
       }
 
       &--variable {
@@ -182,7 +182,7 @@
       float: left;
 
       svg {
-        color: $app-turquoise;
+        color: #0b0c0c;
       }
     }
 

src/gds_service_toolkit/assets/src/frontend/sass/includes/_homepage.scss

@@ -270,10 +270,7 @@ body.hasHover {
 
 .brand--ncs {
 	.brand__color {
-		&:link, &:visited, &:active {
-			color: #207e77;
-		}
-		&:hover,&:focus {
+		&:link, &:visited, &:active, &:hover,&:focus {
 			color: #0b0c0c;
 		}
 	}

src/gds_service_toolkit/assets/src/frontend/sass/patterns/job-profiles.scss

@@ -307,7 +307,7 @@
 
   .job-profile-hours {
     &:before {
-      background: govuk-image-url("clock.svg") no-repeat center;
+      background: govuk-image-url("calendar-alt.svg") no-repeat center;
     }
 
     p {
@@ -317,7 +317,7 @@
 
   .job-profile-pattern {
     &:before {
-      background: govuk-image-url("calendar-alt.svg") no-repeat center;
+      background: govuk-image-url("clock.svg") no-repeat center;
     }
 
     p {

src/gds_service_toolkit/assets/src/frontend/sass/patterns/search.scss

@@ -92,6 +92,8 @@
   }
 
   .results-block {
+    margin-top: 20px;
+
     .result-count {
       padding: 0;
     }

src/nationalcareers_toolkit/assets/src/frontend/js/cookie-prefrences-banner.js

@@ -1,5 +1,5 @@
 $(document).ready(function () {
-    var printHtml = '<button id="accept-all-cookies" class="govuk-button" type="button" data-module="track-click" data-accept-cookies="true" data-track-category="cookieBanner" data-track-action="Cookie banner accepted">Accept all cookies</button>';
+    var printHtml = '<button id="accept-all-cookies" class="govuk-button ncs-button__primary" type="button" data-module="track-click" data-accept-cookies="true" data-track-category="cookieBanner" data-track-action="Cookie banner accepted">Accept all cookies</button>';
     $('#accept-cookies-div').html(printHtml);
 
     if (!cookiePrefrences.isCookiePrefrenceSet()) {

src/nationalcareers_toolkit/assets/src/frontend/sass/branding/all.scss

@@ -1,15 +1,15 @@
 @import "variables.scss";
 
 //import component styles
-//@import "side-navigation.scss";
-//@import "back-to-top.scss";
-//@import "button.scss";
-//@import "header.scss";
+@import "side-navigation.scss";
+@import "back-to-top.scss";
+@import "button.scss";
+@import "header.scss";
 @import "highlightbox.scss";
-//@import "progress-bar.scss";
-//@import "error-summary.scss";
-//@import "search.scss";
+@import "progress-bar.scss";
+@import "error-summary.scss";
+@import "search.scss";
 @import "panel.scss";
-//@import "error-message.scss";
-//@import "ticket-panel.scss";
-//@import "banner-notification.scss";
+@import "error-message.scss";
+@import "ticket-panel.scss";
+@import "banner-notification.scss";

src/nationalcareers_toolkit/assets/src/frontend/sass/branding/banner-notification.scss

@@ -1,6 +1,5 @@
 .ncs-notification-banner {
     border: 4px solid $bright_purple;
-    background-color: $bright_purple;
 
     .govuk-notification-banner__heading {
         font-size: 24px;

src/nationalcareers_toolkit/assets/src/frontend/sass/branding/button.scss

@@ -15,9 +15,10 @@
     &:focus,
     &:focus:not(:active):not(:hover) {
         color: $text_white;
-        outline: 2px solid $focus_yellow;
+        outline: 2px solid $focus_yellow !important;
         border-color: $focus_yellow;
         box-shadow: none;
+        outline-offset: 0px !important;
     }
 
     .govuk-button__start-icon {
@@ -44,6 +45,7 @@
     &:focus:not(:active):not(:hover) {
         color: $text_white;
         background-color: $primary_pink;
+        outline-offset: 0px !important;
     }
 }
 

src/nationalcareers_toolkit/assets/src/frontend/sass/branding/header.scss

@@ -126,7 +126,7 @@
         }
 
         .ncs-logo {
-            background: url(https://lab-cdn.nationalcareersservice.org.uk/media/headers/logo-no-descriptor.png) no-repeat;
+            background: url("../images/ncs-logo.png") no-repeat;
             background-size: contain;
             position: absolute;
             top: -6px;
@@ -226,3 +226,7 @@
 .app-example-wrapper .ncs-hero .content .sub-heading .block span {
     margin: 0 2px;
 }
+
+.ncs-header-white {
+   color: $background_white !important;
+}

src/nationalcareers_toolkit/assets/src/frontend/sass/branding/highlightbox.scss

@@ -20,7 +20,9 @@
 
         &:focus {
             .ncs-highlight-box__card {
-                box-shadow: 0px 0 2px $primary_black;
+                outline: #fd0 solid 3px;
+                outline-offset: 0;
+                box-shadow: inset 0 0 0 3px $primary_black !important;
             }
         }
     }

src/nationalcareers_toolkit/assets/src/frontend/sass/branding/variables.scss

@@ -21,7 +21,7 @@ $light_blue_25: #5694ca25;
 
 
 /* Typography */
-$gds_font: 'GDS Transport';
+$gds_font: "GDS Transport",Arial,sans-serif;
 
 
 

src/nationalcareers_toolkit/assets/src/frontend/sass/compui/application.scss

@@ -31,6 +31,16 @@ $govuk-assets-path: '/govuk/assets/';
     width: 100%;
 }
 
+.fac-main-wrapper {
+    padding-top: 40px;
+}
+
+@media (min-width: 40.0625em) {
+    .fac-main-wrapper {
+        padding-top: 60px;
+    }
+}
+
 .fac-search-hero .govuk-width-container {
     padding: 0;
 }
@@ -126,11 +136,8 @@ $govuk-assets-path: '/govuk/assets/';
 
 .fac-feature-box {
     padding: 30px 30px 10px 30px;
-    margin-top: 10px;
-    margin-bottom: 20px;
-}
-
-.fac-feature-box {
+    margin-top: 0;
+    margin-bottom: 60px;
     background-color: #f3f2f1;
 }
 
@@ -139,16 +146,53 @@ $govuk-assets-path: '/govuk/assets/';
 }
 
 .fac-feature-box__card {
-    background-color: #f3f2f1;
-    padding: 20px;
+    padding: 0;
 }
 
 .fac-feature-box__content > img {
-    width: 100%;
+    width: 320px;
+    height: 213.5px;
+    border-top-right-radius: 30px;
+    border-bottom-left-radius: 30px;
+    object-fit: cover;
+    object-position: top;
+}
+
+.fac-feature-box__content h2 {
+    margin-top: 20px;
+    margin-bottom: 20px;
+    font-size: 18px;
+    line-height: 20px;
+}
+
+.fac-feature-box__content p {
+    font-size: 16px;
+    line-height: 20px;
+}
+
+@media (min-width: 40.0625em) {
+    .fac-feature-box {
+        margin-bottom: 20px;
+    }
+
+    .fac-feature-box__content h2 {
+        margin-bottom: 15px;
+        font-size: 24px;
+        line-height: 30px;
+    }
+
+    .fac-feature-box__content p {
+        font-size: 19px;
+        line-height: 25px;
+    }
+
+    .fac-feature-box__content > img {
+        width: 259.99px;
+        height: 173.46px;
+    }
 }
 
 .fac-feature-box .govuk-button {
-    width: 100%;
     float: none;
 }