From 84ea689a8c130196efe8f3e02e3346657584e2c9 Mon Sep 17 00:00:00 2001
From: Gemma Leigh <hello@gemmaleigh.com>
Date: Tue, 11 Oct 2016 18:25:30 +0100
Subject: [PATCH 1/4] Remove the unbranded partial

---
 app/assets/sass/application.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 {

From e18c832dbe73d407d05de592230d1213d941d9b5 Mon Sep 17 00:00:00 2001
From: Gemma Leigh <hello@gemmaleigh.com>
Date: Tue, 11 Oct 2016 18:26:08 +0100
Subject: [PATCH 2/4] Generate a new stylesheet from the unbranded partial

Rename to not use an underscore, so a new stylesheet is created.
---
 app/assets/sass/{patterns/_unbranded.scss => unbranded.scss} | 5 +++++
 1 file changed, 5 insertions(+)
 rename app/assets/sass/{patterns/_unbranded.scss => unbranded.scss} (72%)

diff --git a/app/assets/sass/patterns/_unbranded.scss b/app/assets/sass/unbranded.scss
similarity index 72%
rename from app/assets/sass/patterns/_unbranded.scss
rename to app/assets/sass/unbranded.scss
index 8e83299aab..8f998b6c05 100644
--- a/app/assets/sass/patterns/_unbranded.scss
+++ b/app/assets/sass/unbranded.scss
@@ -1,3 +1,7 @@
+// 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 +14,7 @@ $toolkit-font-stack: $Helvetica-Regular;
 
   // Use the universal selector and !important to *ALWAYS OVERRIDE* GDS Transport
   * {
+
     font-family: $toolkit-font-stack !important;
   }
 

From 9cadd5fbf498173ceff986d7cb6733e5c15e1569 Mon Sep 17 00:00:00 2001
From: Gemma Leigh <hello@gemmaleigh.com>
Date: Tue, 11 Oct 2016 18:27:39 +0100
Subject: [PATCH 3/4] Use the unbranded stylesheet

---
 app/views/layout_unbranded.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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" %}
+  <link href="/public/stylesheets/unbranded.css" media="screen" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block body_end %}

From 23853f8f365ecde029ee252e531f5fd6b8611ee5 Mon Sep 17 00:00:00 2001
From: Gemma Leigh <hello@gemmaleigh.com>
Date: Thu, 13 Oct 2016 09:48:24 +0100
Subject: [PATCH 4/4] Add missing path to assets for the unbranded stylesheet

---
 app/assets/sass/unbranded.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/sass/unbranded.scss b/app/assets/sass/unbranded.scss
index 8f998b6c05..45ef6aa312 100644
--- a/app/assets/sass/unbranded.scss
+++ b/app/assets/sass/unbranded.scss
@@ -1,3 +1,7 @@
+// 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';