diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss index 4ff5c9b48a..ed8f66ed8d 100644 --- a/app/assets/sass/application.scss +++ b/app/assets/sass/application.scss @@ -8,7 +8,6 @@ $path: "/public/images/"; // Take a look at in app/assets/sass/patterns/ to see which files are imported. @import 'patterns/check-your-answers'; -@import 'patterns/unbranded'; // Related items // (These styles will be moved to GOV.UK elements, duplicating here for now.) @@ -19,7 +18,7 @@ $path: "/public/images/"; .heading-medium { margin-top: 0.3em; - margin-bottom: 0.5em + margin-bottom: 0.5em; } li { diff --git a/app/assets/sass/patterns/_unbranded.scss b/app/assets/sass/unbranded.scss similarity index 62% rename from app/assets/sass/patterns/_unbranded.scss rename to app/assets/sass/unbranded.scss index 8e83299aab..45ef6aa312 100644 --- a/app/assets/sass/patterns/_unbranded.scss +++ b/app/assets/sass/unbranded.scss @@ -1,3 +1,11 @@ +// Path to assets for use with the file-url function +// in the govuk frontend toolkit's url-helpers partial +$path: "/public/images/"; + +// Import GOV.UK elements from /govuk-modules/, this will import the frontend toolkit and some base styles. +// Take a look in /govuk-modules/_govuk-elements.scss to see which files are imported. +@import 'govuk-elements'; + // If you need to create a page as part of your journey, but without GOV.UK branding // See localhost:3000/examples/unbranded/ @@ -10,6 +18,7 @@ $toolkit-font-stack: $Helvetica-Regular; // Use the universal selector and !important to *ALWAYS OVERRIDE* GDS Transport * { + font-family: $toolkit-font-stack !important; } diff --git a/app/views/layout_unbranded.html b/app/views/layout_unbranded.html index 2a4d573122..b3286f2b88 100644 --- a/app/views/layout_unbranded.html +++ b/app/views/layout_unbranded.html @@ -1,7 +1,7 @@ {% extends "govuk_template_unbranded.html" %} {% block head %} - {% include "includes/head.html" %} + {% endblock %} {% block body_end %}