From 34991c35767993171137c9782d498d42e1ebe5fc Mon Sep 17 00:00:00 2001
From: Andrew White <andrew.white@unboxed.co>
Date: Mon, 27 Jan 2025 05:36:48 +0000
Subject: [PATCH] Consolidate existing frontend CSS

This is to make it easier to implement the new Parliament brand.
---
 app/assets/stylesheets/application.css        |   1 -
 app/assets/stylesheets/application.scss       |   1 +
 .../stylesheets/govuk_elements/_buttons.scss  |  50 ----
 .../govuk_elements/_elements-typography.scss  | 193 -------------
 .../stylesheets/govuk_elements/_icons.scss    | 246 ----------------
 .../stylesheets/govuk_elements/_layout.scss   |  71 -----
 .../stylesheets/govuk_elements/_reset.scss    |  33 ---
 .../govuk_template/_accessibility.scss        | 100 -------
 .../stylesheets/govuk_template/_basic.scss    | 173 -----------
 .../stylesheets/govuk_template/_footer.scss   | 179 ------------
 .../stylesheets/govuk_template/_header.scss   | 269 ------------------
 app/assets/stylesheets/site.scss              |  43 ---
 .../stylesheets/{ => site}/_animate.scss      |   0
 app/assets/stylesheets/site/_index.scss       |  37 +++
 .../govuk}/_colours.scss                      |   0
 .../govuk}/_conditionals.scss                 |   0
 .../govuk}/_css3.scss                         |   0
 .../govuk}/_details.scss                      |   2 +-
 .../govuk}/_device-pixels.scss                |   0
 .../govuk}/_font_stack.scss                   |   0
 .../govuk}/_forms.scss                        |   0
 .../govuk}/_grid_layout.scss                  |   0
 .../govuk}/_helpers.scss                      |  10 +-
 .../govuk}/_lists.scss                        |   0
 .../govuk}/_measurements.scss                 |   0
 .../govuk}/_panels.scss                       |   0
 .../govuk}/_shims.scss                        |   0
 .../govuk}/_tables.scss                       |   4 +-
 .../govuk}/_typography.scss                   |   0
 .../govuk}/_url-helpers.scss                  |   0
 .../govuk}/colours/_organisation.scss         |   0
 .../govuk}/colours/_palette.scss              |   2 +-
 .../govuk}/design-patterns/_alpha-beta.scss   |   0
 .../govuk}/design-patterns/_buttons.scss      |   0
 .../govuk}/design-patterns/_media-player.scss |   0
 .../govuk}/forms/_form-block-labels.scss      |   6 +-
 .../govuk}/forms/_form-date.scss              |   0
 .../govuk}/forms/_form-multiple-choice.scss   |   0
 .../govuk}/forms/_form-validation.scss        |   0
 .../{ => site}/petitions/_accessibility.scss  |   0
 .../{ => site}/petitions/_basic.scss          |   0
 .../{ => site}/petitions/_buttons.scss        |   6 +-
 .../{ => site}/petitions/_colours.scss        |   0
 .../{ => site}/petitions/_details.scss        |   2 +-
 .../{ => site}/petitions/_footer.scss         |   0
 .../{ => site}/petitions/_forms.scss          |   0
 .../{ => site}/petitions/_header.scss         |   0
 .../{ => site}/petitions/_helpers.scss        |   0
 .../{ => site}/petitions/_icons.scss          |   2 +-
 .../{ => site}/petitions/_layout.scss         |   6 +-
 .../{ => site}/petitions/_panels.scss         |   0
 .../{ => site}/petitions/_reset.scss          |   0
 .../{ => site}/petitions/_search-inline.scss  |   0
 .../{ => site}/petitions/_tables.scss         |   0
 .../{ => site}/petitions/_tumble.scss         |   0
 .../{ => site}/petitions/_typography.scss     |   4 +-
 .../{ => site}/petitions/views/_home.scss     |   0
 .../{ => site}/petitions/views/_page.scss     |   0
 .../petitions/views/_petition-create.scss     |   0
 .../petitions/views/_petition-show.scss       |   0
 .../{ => site}/petitions/views/_search.scss   |   0
 .../{ => site}/petitions/views/_shared.scss   |   0
 .../{ => site}/petitions/views/_sign.scss     |   0
 .../views/shared/_petition-item.scss          |   0
 .../views/shared/_share-petition.scss         |   0
 65 files changed, 60 insertions(+), 1380 deletions(-)
 delete mode 100644 app/assets/stylesheets/application.css
 create mode 100644 app/assets/stylesheets/application.scss
 delete mode 100644 app/assets/stylesheets/govuk_elements/_buttons.scss
 delete mode 100644 app/assets/stylesheets/govuk_elements/_elements-typography.scss
 delete mode 100644 app/assets/stylesheets/govuk_elements/_icons.scss
 delete mode 100644 app/assets/stylesheets/govuk_elements/_layout.scss
 delete mode 100644 app/assets/stylesheets/govuk_elements/_reset.scss
 delete mode 100644 app/assets/stylesheets/govuk_template/_accessibility.scss
 delete mode 100644 app/assets/stylesheets/govuk_template/_basic.scss
 delete mode 100644 app/assets/stylesheets/govuk_template/_footer.scss
 delete mode 100644 app/assets/stylesheets/govuk_template/_header.scss
 delete mode 100644 app/assets/stylesheets/site.scss
 rename app/assets/stylesheets/{ => site}/_animate.scss (100%)
 create mode 100644 app/assets/stylesheets/site/_index.scss
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_colours.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_conditionals.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_css3.scss (100%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/_details.scss (94%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_device-pixels.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_font_stack.scss (100%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/_forms.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_grid_layout.scss (100%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/_helpers.scss (80%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/_lists.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_measurements.scss (100%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/_panels.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_shims.scss (100%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/_tables.scss (87%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_typography.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/_url-helpers.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/colours/_organisation.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/colours/_palette.scss (99%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/design-patterns/_alpha-beta.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/design-patterns/_buttons.scss (100%)
 rename app/assets/stylesheets/{govuk_frontend_toolkit => site/govuk}/design-patterns/_media-player.scss (100%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/forms/_form-block-labels.scss (89%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/forms/_form-date.scss (100%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/forms/_form-multiple-choice.scss (100%)
 rename app/assets/stylesheets/{govuk_elements => site/govuk}/forms/_form-validation.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_accessibility.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_basic.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_buttons.scss (86%)
 rename app/assets/stylesheets/{ => site}/petitions/_colours.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_details.scss (95%)
 rename app/assets/stylesheets/{ => site}/petitions/_footer.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_forms.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_header.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_helpers.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_icons.scss (99%)
 rename app/assets/stylesheets/{ => site}/petitions/_layout.scss (90%)
 rename app/assets/stylesheets/{ => site}/petitions/_panels.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_reset.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_search-inline.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_tables.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_tumble.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/_typography.scss (95%)
 rename app/assets/stylesheets/{ => site}/petitions/views/_home.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/views/_page.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/views/_petition-create.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/views/_petition-show.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/views/_search.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/views/_shared.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/views/_sign.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/views/shared/_petition-item.scss (100%)
 rename app/assets/stylesheets/{ => site}/petitions/views/shared/_share-petition.scss (100%)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
deleted file mode 100644
index 25a6970b2..000000000
--- a/app/assets/stylesheets/application.css
+++ /dev/null
@@ -1 +0,0 @@
-// = require 'site'
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
new file mode 100644
index 000000000..0399bdadc
--- /dev/null
+++ b/app/assets/stylesheets/application.scss
@@ -0,0 +1 @@
+@import "site";
diff --git a/app/assets/stylesheets/govuk_elements/_buttons.scss b/app/assets/stylesheets/govuk_elements/_buttons.scss
deleted file mode 100644
index 4da450775..000000000
--- a/app/assets/stylesheets/govuk_elements/_buttons.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-// Buttons
-// ==========================================================================
-// GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/design-patterns/buttons";
-@import "../govuk_frontend_toolkit/measurements";
-@import "../govuk_frontend_toolkit/typography";
-
-.button {
-  @include button ($button-colour);
-  margin: 0 $gutter-half $gutter-half 0;
-  padding: em(10) em(15) em(5) em(15);
-  vertical-align: top;
-}
-
-// Fix unwanted button padding in Firefox
-.button::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-
-.button:focus {
-  outline: 3px solid $focus-colour;
-}
-
-// Disabled buttons
-.button[disabled="disabled"] {
-  background: $button-colour;
-}
-
-.button[disabled="disabled"]:focus {
-  outline: none;
-}
-
-// Start now buttons
-.button-get-started {
-  @include bold-24;
-  background-image: file-url("icons/icon-pointer.png");
-  background-repeat: no-repeat;
-  background-position: 100% 50%;
-  padding: em(7) em(41) em(4) em(16);
-
-  @include device-pixel-ratio {
-    background-image: file-url("icons/icon-pointer-2x.png");
-    background-size: 30px 19px;
-  }
-
-  @include ie(6) {
-    background-image: file-url("icons/icon-pointer-2x.png");
-  }
-}
diff --git a/app/assets/stylesheets/govuk_elements/_elements-typography.scss b/app/assets/stylesheets/govuk_elements/_elements-typography.scss
deleted file mode 100644
index 72eb3dda1..000000000
--- a/app/assets/stylesheets/govuk_elements/_elements-typography.scss
+++ /dev/null
@@ -1,193 +0,0 @@
-// Typography
-// ==========================================================================
-
-// GOV.UK front end toolkit dependencies
-@import "helpers";
-@import "../govuk_frontend_toolkit/typography";
-@import "../govuk_frontend_toolkit/colours";
-
-// Increase the base font size to 19px for the main content area
-// Using the core-19 mixin from the govuk_toolkit _typography.scss file
-
-main {
-  @include core-19;
-  -webkit-font-smoothing: antialiased;
-}
-
-// Core font sizes
-.font-xxlarge {
-  @include core-80;
-}
-
-.font-xlarge {
-  @include core-48;
-}
-
-.font-large {
-  @include core-36;
-}
-
-.font-medium {
-  @include core-24;
-}
-
-.font-small {
-  @include core-19;
-}
-
-.font-xsmall {
-  @include core-16;
-}
-
-// Bold font sizes
-.bold-xxlarge {
-  @include bold-80();
-}
-
-.bold-xlarge {
-  @include bold-48();
-}
-
-.bold-large {
-  @include bold-36();
-}
-
-.bold-medium {
-  @include bold-24();
-}
-
-.bold-small {
-  @include bold-19();
-}
-
-.bold-xsmall {
-  @include bold-16();
-}
-
-// Common heading sizes
-// Using the bold-xx mixins from the govuk_toolkit _typography.scss file
-// Spacing is set in em, using the px to em function in the elements _helpers.scss file
-
-// Headings
-h1 {
-  @include bold-48();
-
-  margin-top: em(15, 32);
-  margin-bottom: em(30, 32);
-
-  @include media(tablet) {
-    margin-top: em(30, 48);
-    margin-bottom: em(60, 48);
-  }
-
-  .heading-secondary {
-    @include heading-27();
-
-    display: block;
-    color: $secondary-text-colour;
-  }
-
-}
-
-h2 {
-  @include bold-36();
-
-  margin-top: em(25, 24);
-  margin-bottom: em(10, 24);
-
-  @include media(tablet) {
-    margin-top: em(45, 36);
-    margin-bottom: em(20, 36);
-  }
-
-  .heading-secondary {
-    @include heading-24();
-
-    display: block;
-    color: $secondary-text-colour;
-  }
-
-}
-
-h3 {
-  @include bold-24();
-
-  margin-top: em(25, 20);
-  margin-bottom: em(10, 20);
-
-  @include media(tablet) {
-    margin-top: em(45, 24);
-    margin-bottom: em(20, 24);
-  }
-
-}
-
-h4 {
-  @include bold-19();
-
-  margin-top: em(10, 16);
-  margin-bottom: em(5, 16);
-
-  @include media(tablet) {
-    margin-top: em(20, 19);
-  }
-
-}
-
-// Text
-p {
-  margin-top: em(5, 16);
-  margin-bottom: em(20, 16);
-
-  @include media(tablet) {
-    margin-top: em(5);
-    margin-bottom: em(20);
-  }
-
-}
-
-// Lede, or intro text
-.lede {
-  @include core-24;
-}
-
-// Set a max-width for text blocks
-// Less than 75 characters per line of text
-.text {
-  max-width: 30em;
-}
-
-.text-secondary {
-  color: $secondary-text-colour;
-}
-
-// Link styles
-a {
-  color: $link-colour;
-  text-decoration: underline;
-}
-
-a:visited {
-  color: $link-visited-colour;
-}
-
-a:hover {
-  color: $link-hover-colour;
-}
-
-a:active {
-  color: $link-colour;
-}
-
-// Code styles
-pre,
-code {
-  font-size: 13px;
-  line-height: 19px;
-  color: $black;
-  background-color: $highlight-colour;
-  border: 1px solid $border-colour;
-  padding: 3px 7px;
-}
-
-
diff --git a/app/assets/stylesheets/govuk_elements/_icons.scss b/app/assets/stylesheets/govuk_elements/_icons.scss
deleted file mode 100644
index e235f1b9f..000000000
--- a/app/assets/stylesheets/govuk_elements/_icons.scss
+++ /dev/null
@@ -1,246 +0,0 @@
-// GOV.UK icons
-// GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/device-pixels";
-
-.icon {
-  background-position: 0 0;
-  background-repeat: no-repeat;
-}
-
-.icon-calendar {
-  width: 27px;
-  height: 27px;
-  background-image: file-url("icons/icon-calendar.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-calendar-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-download {
-  width: 30px;
-  height: 39px;
-  background-image: file-url("icons/icon-file-download.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-file-download-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-important {
-  width: 34px;
-  height: 34px;
-  background-image: file-url("icons/icon-important.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-important-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-information {
-  width: 27px;
-  height: 27px;
-  background-image: file-url("icons/icon-information.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-information-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-locator {
-  width: 26px;
-  height: 36px;
-  background-image: file-url("icons/icon-locator.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-locator-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-search {
-  width: 30px;
-  height: 22px;
-  background-color: $black;
-  background-image: file-url("icons/icon-search.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-search-2x.png");
-    background-size: 100%;
-  }
-}
-
-// GOV.UK arrow icons
-.icon-pointer {
-  width: 30px;
-  height: 19px;
-  background-color: $black;
-  background-image: file-url("icons/icon-pointer.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-pointer-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-pointer-black {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-pointer-black.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-pointer-black-2x.png");
-    background-size: 100%;
-  }
-}
-
-// GOV.UK external link icons
-// TODO (Are these provided by the template?)
-
-// GOV.UK step icons
-.icon-step-1 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-1.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-1-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-2 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-2.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-2-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-3 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-3.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-3-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-4 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-4.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-4-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-5 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-5.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-5-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-6 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-6.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-6-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-7 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-7.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-7-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-8 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-8.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-8-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-9 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-9.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-9-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-10 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-10.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-10-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-11 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-11.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-11-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-12 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-12.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-12-2x.png");
-    background-size: 100%;
-  }
-}
-
-.icon-step-13 {
-  width: 23px;
-  height: 23px;
-  background-image: file-url("icons/icon-steps/icon-step-13.png");
-
-  @include device-pixel-ratio() {
-    background-image: file-url("icons/icon-steps/icon-step-13-2x.png");
-    background-size: 100%;
-  }
-}
diff --git a/app/assets/stylesheets/govuk_elements/_layout.scss b/app/assets/stylesheets/govuk_elements/_layout.scss
deleted file mode 100644
index 6436a5284..000000000
--- a/app/assets/stylesheets/govuk_elements/_layout.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-// Layout
-// ==========================================================================
-
-// GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/measurements";
-@import "../govuk_frontend_toolkit/conditionals";
-@import "../govuk_frontend_toolkit/grid_layout";
-@import "helpers";
-@import "../govuk_frontend_toolkit/design-patterns/alpha-beta";
-
-
-// Content
-// ==========================================================================
-
-// Content wraps the entire site content block
-#content {
-  @extend %site-width-container;
-  @extend %contain-floats;
-  padding-bottom: $gutter;
-
-  @include media(desktop) {
-    padding-bottom: $gutter*3;
-  }
-}
-
-
-// Phase banner
-// ==========================================================================
-
-.phase-banner {
-  @include phase-banner(alpha);
-}
-
-
-// Grid layout
-// ==========================================================================
-
-// Usage:
-// For two equal columns
-
-// <div class="grid-row">
-//   <div class="column-half">
-//
-//   </div>
-//   <div class="column-half">
-//
-//   </div>
-// </div>
-
-// Use .grid-row to define a row for grid columns to sit in
-.grid-row {
-  @extend %grid-row;
-}
-
-// Use .grid-column to create a grid column with 15px gutter
-// By default grid columns break to become full width at tablet size
-.column-quarter {
-  @include grid-column(1/4);
-}
-
-.column-half {
-  @include grid-column(1/2);
-}
-
-.column-third {
-  @include grid-column(1/3);
-}
-
-.column-two-thirds {
-  @include grid-column(2/3);
-}
diff --git a/app/assets/stylesheets/govuk_elements/_reset.scss b/app/assets/stylesheets/govuk_elements/_reset.scss
deleted file mode 100644
index d157dbeed..000000000
--- a/app/assets/stylesheets/govuk_elements/_reset.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-// Reset
-// ==========================================================================
-// flatten all browser defaults and styles inherited from gov.uk template
-
-/* Borrowed from http://meyerweb.com/eric/tools/css/reset/ */
-div, span,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark {
-  border: none;
-  margin: 0;
-  padding: 0;
-}
-
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-input, textarea,
-table, caption, tbody, tfoot, thead, tr, th, td {
-  font-size: inherit;
-  font-family: inherit;
-  line-height: inherit;
-  font-weight: normal;
-}
diff --git a/app/assets/stylesheets/govuk_template/_accessibility.scss b/app/assets/stylesheets/govuk_template/_accessibility.scss
deleted file mode 100644
index aba43f71f..000000000
--- a/app/assets/stylesheets/govuk_template/_accessibility.scss
+++ /dev/null
@@ -1,100 +0,0 @@
-/* For image replacement */
-.ir {
-  display: block;
-  text-indent: -999em;
-  overflow: hidden;
-  background-repeat: no-repeat;
-  text-align: left;
-  direction: ltr;
-
-  br {
-    display: none;
-  }
-}
-
-/* Hide for both screenreaders and browsers */
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-/* Hide only visually, but have it available for screenreaders */
-.visuallyhidden {
-  position: absolute;
-  left: -9999em;
-
-  /*
-   * Extends the .visuallyhidden class to allow the element to be
-   * focusable when navigated to via the keyboard
-   */
-  &.focusable:active,
-  &.focusable:focus {
-    clip: auto;
-    height: auto;
-    margin: 0;
-    overflow: visible;
-    position: static;
-    width: auto;
-  }
-}
-
-/* Hide visually and from screenreaders, but maintain layout */
-.invisible {
-  visibility: hidden;
-}
-
-/* Give a strong clear visual idea as to what is currently in focus */
-a {
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0.3);
-}
-
-a:focus {
-  background-color: $focus-colour;
-  outline: 3px solid $focus-colour;
-}
-
-/* Make skiplinks visible when they are tabbed to */
-
-.skiplink {
-  position: absolute;
-  left: -9999em;
-}
-
-.skiplink:focus {
-  position: static;
-}
-
-#skiplink-container {
-  text-align: center;
-  background: $black;
-
-  div {
-    text-align: left;
-    margin: 0 auto;
-    max-width: 1020px;
-  }
-
-  .skiplink {
-    @include inline-block;
-    margin: 0.75em 0 0 30px;
-  }
-}
-
-input:focus,
-textarea:focus,
-select:focus,
-button:focus,
-#global-header input:focus {
-  outline: 3px solid $focus-colour;
-}
-
-#global-header {
-  h1 a:focus {
-    background-color: transparent;
-    outline: none;
-  }
-
-  a:focus {
-	  color: $black;
-  }
-}
diff --git a/app/assets/stylesheets/govuk_template/_basic.scss b/app/assets/stylesheets/govuk_template/_basic.scss
deleted file mode 100644
index a4fc73f9a..000000000
--- a/app/assets/stylesheets/govuk_template/_basic.scss
+++ /dev/null
@@ -1,173 +0,0 @@
-html, body, button, input, table, td, th { font-family: $petitions-font; }
-
-// basic styles for HTML5 and other elements
-html, body, div, h1, h2, h3, h4, h5, h6, article, aside, footer, header, hgroup, nav, section {
-  margin: 0;
-  padding: 0;
-  vertical-align: baseline;
-}
-
-// HTML5 display definition
-main {
-  display: block;
-}
-
-// self clearing floats
-.group:before,
-.group:after {
-    content: "\0020";
-    display: block;
-    height: 0;
-    overflow: hidden;
- }
-
-.group:after {
-    clear: both;
-}
-.group {
-    zoom: 1;
-}
-
-// make elements stick at top of viewport when scrolling
-.content-fixed {
-  top: 0;
-  position: fixed;
-}
-.shim {
-  display: block;
-}
-
-/*
- * 1. Prevents iOS text size adjust after orientation change, without disabling
- *    user zoom.
- */
-html {
-  -webkit-text-size-adjust: 100%; /* 1 */
-  -ms-text-size-adjust: 100%; /* 1 */
-  // Set background colour to match footer background
-  background-color: $grey-3;
-}
-
-/*
-  Force the scrollbar to always display in IE10/11
- */
-html {
-  -ms-overflow-style: scrollbar;
-}
-
-body {
-  background: $white;
-  color: $text-colour;
-  line-height: 1.5;
-  font-weight: 400;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-ol, ul, nav ol, nav ul {
-  list-style: inherit;
-}
-
-fieldset {
-  border: none;
-  padding: 0;
-}
-
-a:link {
-  color: $link-colour;
-}
-
-a:visited {
-  color: $link-visited-colour;
-}
-
-a:hover {
-  color: $link-hover-colour;
-}
-
-a:active {
-  color: $link-active-colour;
-}
-
-a[rel="external"] {
-  @include external-link-default;
-  @include external-link-19;
-  @include media(mobile) {
-    @include external-link-16;
-  }
-}
-
-.external-link {
-  @include external-link-12-no-hover;
-  @include external-link-heading;
-}
-
-// adjustments to normalize.css
-
-/*
- * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
- *    http://clagnut.com/blog/348/#c790
- *    note - font-size reduced to 62.5% to allow simple rem/px font-sizing and fallback
- *    http://snook.ca/archives/html_and_css/font-size-with-rem
- * 2. Keeps page centred in all browsers regardless of content height
- * 3. Removes Android and iOS tap highlight color to prevent entire container being highlighted
- *    www.yuiblog.com/blog/2010/10/01/quick-tip-customizing-the-mobile-safari-tap-highlight-color/
- */
-
-html {
-  font-size: 62.5%; /* 1 */
-  overflow-y: scroll; /* 2 */
-  -webkit-tap-highlight-color: rgba(0,0,0,0); /* 3 */
-}
-
-/*
- * 1. Font-size increased to compensate for change to html element font-size in
- *    order to support beta typography which was set in ems
- *    (62.5% * 160% = 100%)
- * 2. Addresses margins handled incorrectly in IE6/7
- */
-
-body {
-  font-size: 160%; /* 1 */
-  margin: 0; /* 2 */
-}
-
-b,
-strong {
-  font-weight: 600;
-}
-
-img {
-  border: 0;
-}
-
-@include ie-lte(7) {
-  button {
-    overflow:visible;
-  }
-}
-
-abbr[title] {
-  cursor: help;
-}
-
-/*
- * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
- * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
- *    (include `-moz` to future-proof).
- */
-
-input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
-    box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: searchfield-cancel-button;
-  margin-right: 2px;
-}
-
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
diff --git a/app/assets/stylesheets/govuk_template/_footer.scss b/app/assets/stylesheets/govuk_template/_footer.scss
deleted file mode 100644
index b8a53b32a..000000000
--- a/app/assets/stylesheets/govuk_template/_footer.scss
+++ /dev/null
@@ -1,179 +0,0 @@
-/* Global footer */
-
-#footer {
-  background-color: $panel-colour;
-  border-top: 1px solid $border-colour;
-
-  .footer-wrapper {
-    @extend %grid-row;
-    padding-top: 20px;
-    @include media(tablet) {
-      padding-top: 60px;
-    }
-    background-color: $panel-colour;
-    margin: 0 auto;
-  }
-
-  a {
-    color: $panel-colour;
-
-    &:hover {
-      color: $secondary-text-colour;
-    }
-  }
-
-  h2 {
-    @include core-24;
-    font-weight: bold;
-    color: $secondary-text-colour;
-    margin: 0;
-
-    a {
-      color: inherit;
-    }
-  }
-
-  .footer-meta {
-    @include grid-column( 1 );
-    @extend %contain-floats;
-    padding-bottom: 60px;
-    clear: both;
-    font-size: 0;
-    color: $panel-colour;
-
-    .footer-meta-inner {
-      display: inline-block;
-      vertical-align: bottom;
-      width: 100%;
-
-      @include media(tablet) {
-        width: 75%;
-      }
-
-      @include ie-lte(7) {
-        float: left;
-        display: block;
-      }
-
-      ul {
-        @include core-16($line-height: (24/16), $line-height-640: (24/16));
-        display: inline-block;
-        list-style: none;
-        margin: 0 0 1.5em 0;
-        padding: 0;
-
-        @include media(tablet) {
-          margin: 0 0 1em 0;
-        }
-
-        li {
-          display: inline-block;
-          margin: 0 15px 0 0;
-
-          @include ie-lte(7) {
-            display: inline;
-            margin-right: 0;
-            padding-right: 15px;
-          }
-        }
-      }
-
-      .open-government-licence {
-        clear: left;
-        position: relative;
-
-        @include media(tablet) {
-          padding-left: 53px;
-        }
-
-        @include ie(6) {
-          zoom: 1;
-        }
-
-        .logo {
-          margin-bottom: 1em;
-          padding-top: 0;
-          @include media(tablet) {
-            position: absolute;
-            left: 0;
-            top: 0;
-            width: 41px;
-            height: 100%;
-          }
-
-          a {
-            display: block;
-            width: 41px;
-            height: 17px;
-            overflow:hidden;
-            text-indent: -999em;
-            background: image-url("images/open-government-licence.png") 0 0 no-repeat;
-            @include device-pixel-ratio() {
-              background-image: image-url("images/open-government-licence_2x.png");
-              background-size: 41px 17px;
-            }
-          }
-        }
-
-        p {
-          @include core-16;
-          margin: 0;
-          padding-top: 0.1em;
-        }
-      }
-    }
-
-    .copyright {
-      @include core-16;
-
-      margin: 30px 0 0 0;
-      width: 100%;
-      display: block;
-
-      @include media(tablet) {
-        display: inline-block;
-        text-align: inherit;
-        width: 25%;
-        padding-top: 15px;
-        margin-top: 0;
-      }
-
-      @include ie-lte(7) {
-        float: right;
-        height: 150px;
-        width: 24%;
-      }
-
-      a {
-        display: block;
-
-        background-image: image-url("images/govuk-crest.png");
-        background-repeat: no-repeat;
-        background-position: 50% 0%;
-
-        @include media(tablet) {
-          background-position: 100% 0%;
-        }
-
-        @include device-pixel-ratio() {
-          background-image: image-url("images/govuk-crest-2x.png");
-          background-size: 125px 102px;
-        }
-
-        @include ie(6) {
-          background-image: image-url("images/govuk-crest-ie.png");
-        }
-
-        text-align: center;
-        text-decoration: none;
-
-        @include media(tablet) {
-          text-align: right;
-        }
-
-        padding: 115px 0 0 0;
-
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/govuk_template/_header.scss b/app/assets/stylesheets/govuk_template/_header.scss
deleted file mode 100644
index 0bb342ada..000000000
--- a/app/assets/stylesheets/govuk_template/_header.scss
+++ /dev/null
@@ -1,269 +0,0 @@
-@import '../govuk_frontend_toolkit/shims';
-@import '../govuk_frontend_toolkit/conditionals';
-@import '../govuk_frontend_toolkit/measurements';
-
-#global-header {
-  background-color: $black;
-  width: 100%;
-
-  .header-wrapper {
-    background-color: $black;
-    max-width: 990px;
-    margin: 0 auto;
-    padding-top: 8px;
-    padding-bottom: 8px;
-    @extend %contain-floats;
-    @include media(tablet){
-      padding-left: $gutter-half;
-      padding-right: $gutter-half;
-    }
-    @include ie-lte(8) {
-      width: 990px;
-    }
-
-    .header-global {
-      @extend %contain-floats;
-      .header-logo {
-        @extend %contain-floats;
-        float: left;
-
-        @include media(desktop){
-          width: 33.33%;
-        }
-        @media screen and (max-width: 379px) {
-          width: auto;
-          float: none;
-        }
-
-        .content {
-          margin: 0 15px;
-        }
-      }
-      .header-logo {
-        margin: 5px 0 2px;
-      }
-    }
-  }
-  &.with-proposition {
-    .header-wrapper {
-      .header-global {
-        @include media(desktop){
-          float: left;
-          width: 33.33%;
-
-          .header-logo,
-          .site-search {
-            width: 100%;
-          }
-        }
-      }
-      .header-proposition {
-        @include media(desktop){
-          width: 66.66%;
-          float: left;
-        }
-        .content {
-          margin: 0 15px;
-        }
-      }
-    }
-  }
-
-  #logo {
-    float: left;
-    position: relative;
-    top: 1px;
-
-    height: 30px;
-    overflow: visible;
-    vertical-align: baseline;
-
-    color: $white;
-    font-weight: bold;
-    font-size: 30px;
-    line-height: 1em;
-    text-decoration: none;
-    text-rendering: optimizeLegibility;
-    margin-bottom: -1px;
-    padding-bottom: 1px;
-
-    img {
-      position: relative;
-      top: -2px;
-
-      width: 35px;
-      height: 31px;
-
-      padding-right: 6px;
-
-      float: left;
-      display: inline;
-      line-height: inherit;
-      border: none;
-    }
-
-    &:hover,
-    &:focus {
-      text-decoration: none;
-      border-bottom: 1px solid;
-      padding-bottom: 0;
-    }
-
-    &:active {
-      color: $light-blue;
-    }
-  }
-  .header-proposition {
-    padding-top: 10px;
-    @include media(desktop){
-      padding-top: 0;
-    }
-    #proposition-name {
-      @include core-24;
-      font-weight: bold;
-      color: $white;
-      text-decoration: none;
-    }
-    a#proposition-name:hover {
-      text-decoration: underline;
-    }
-    a.menu {
-      @include core-16;
-      color: $white;
-      display: block;
-      float: right;
-      text-decoration: none;
-      padding-top: 6px;
-      @include media(desktop){
-        display: none;
-      }
-      &:hover {
-        text-decoration: underline;
-      }
-      &:after {
-        display: inline-block;
-        font-size: 8px;
-        height: 8px;
-        padding-left: 5px;
-        vertical-align: middle;
-        content: " \25BC";
-      }
-      &.js-hidden:after {
-        content: " \25B2";
-      }
-    }
-    #proposition-menu {
-      margin-top: 5px;
-
-      // Some headers (Whitehall) don't have a propsition name, offset as if they did.
-      &.no-proposition-name {
-        @include media(desktop){
-          margin-top: 37px;
-          // 37px is the amount of margin required to line up the nav list with the top of the search box
-        }
-      }
-    }
-    #proposition-link,
-    #proposition-links {
-      clear: both;
-      @extend %contain-floats;
-      margin: 2px 0 0 0;
-      padding: 0;
-
-      .js-enabled & {
-        display: none;
-        @include media(desktop){
-          display: block;
-        }
-        &.js-visible {
-          display: block;
-        }
-      }
-
-      li {
-        float: left;
-        width: 50%;
-        padding: 3px 0;
-        border-bottom: 1px solid $grey-2;
-
-        @include media(desktop){
-          display: block;
-          width: auto;
-          padding: 0 15px 0 0;
-          border-bottom: 0;
-
-          &.clear-child {
-            clear: left;
-          }
-        }
-      }
-
-      a {
-        color: $white;
-        text-decoration: none;
-        @include bold-14;
-
-        @include media(desktop) {
-          @include bold-16;
-          line-height: 23px;
-        }
-
-        &:hover {
-          text-decoration: underline;
-        }
-        &.active {
-          color: $link-active-colour;
-        }
-        &:focus {
-          color: $black;
-        }
-      }
-    }
-
-    #proposition-link {
-      float: right;
-      line-height: 22px;
-      .js-enabled & {
-        display:block;
-      }
-      @include media(desktop) {
-        float:none;
-      }
-    }
-  }
-}
-
-/* Global header bar */
-
-#global-header-bar {
-  @extend %site-width-container;
-  height: 10px;
-  background-color: $govuk-blue;
-  @include ie-lte(8) {
-    font-size: 0;
-  }
-}
-
-/* Global cookie message */
-
-.js-enabled #global-cookie-message {
-  display: none; /* shown with JS, always on for non-JS */
-}
-
-#global-cookie-message {
-  width: 100%;
-  background-color: $light-blue-25;
-  padding-top: 10px;
-  padding-bottom: 10px;
-
-  p {
-    @extend %site-width-container;
-    @include core-16;
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-
-  a:hover {
-    text-decoration: underline;
-  }
-}
diff --git a/app/assets/stylesheets/site.scss b/app/assets/stylesheets/site.scss
deleted file mode 100644
index 07ddb8c8d..000000000
--- a/app/assets/stylesheets/site.scss
+++ /dev/null
@@ -1,43 +0,0 @@
-// From https://github.com/alphagov/govuk_frontend_toolkit/ (edited)
-@import "govuk_frontend_toolkit/conditionals";
-@import "govuk_frontend_toolkit/shims";
-@import "govuk_frontend_toolkit/css3";
-@import "govuk_frontend_toolkit/colours";
-@import "govuk_frontend_toolkit/typography";
-@import "govuk_frontend_toolkit/grid_layout";
-@import "govuk_frontend_toolkit/design-patterns/buttons";
-
-// From https://github.com/alphagov/govuk_elements/ (edited)
-@import "govuk_elements/forms";
-@import "govuk_elements/lists";
-@import "govuk_elements/tables";
-
-// From github.com/daneden/animate.css (edited)
-@import "animate"; // See this file for usage instructions (simple)
-
-// Petitions styles
-@import "petitions/helpers";
-@import "petitions/reset";
-@import "petitions/basic";
-@import "petitions/colours";
-@import "petitions/typography";
-@import "petitions/accessibility";
-@import "petitions/details";
-@import "petitions/icons";
-@import "petitions/panels";
-@import "petitions/buttons";
-@import "petitions/layout";
-@import "petitions/header";
-@import "petitions/footer";
-@import "petitions/forms";
-@import "petitions/search-inline";
-@import "petitions/tables";
-@import "petitions/tumble"; // Animation on signature confirm page
-
-@import "petitions/views/shared";
-@import "petitions/views/petition-show";
-@import "petitions/views/petition-create";
-@import "petitions/views/home";
-@import "petitions/views/page";
-@import "petitions/views/sign";
-@import "petitions/views/search";
diff --git a/app/assets/stylesheets/_animate.scss b/app/assets/stylesheets/site/_animate.scss
similarity index 100%
rename from app/assets/stylesheets/_animate.scss
rename to app/assets/stylesheets/site/_animate.scss
diff --git a/app/assets/stylesheets/site/_index.scss b/app/assets/stylesheets/site/_index.scss
new file mode 100644
index 000000000..7e9a4616a
--- /dev/null
+++ b/app/assets/stylesheets/site/_index.scss
@@ -0,0 +1,37 @@
+@import "govuk/conditionals";
+@import "govuk/shims";
+@import "govuk/css3";
+@import "govuk/colours";
+@import "govuk/typography";
+@import "govuk/grid_layout";
+@import "govuk/design-patterns/buttons";
+@import "govuk/forms";
+@import "govuk/lists";
+@import "govuk/tables";
+
+@import "animate";
+
+@import "petitions/helpers";
+@import "petitions/reset";
+@import "petitions/basic";
+@import "petitions/colours";
+@import "petitions/typography";
+@import "petitions/accessibility";
+@import "petitions/details";
+@import "petitions/icons";
+@import "petitions/panels";
+@import "petitions/buttons";
+@import "petitions/layout";
+@import "petitions/header";
+@import "petitions/footer";
+@import "petitions/forms";
+@import "petitions/search-inline";
+@import "petitions/tables";
+@import "petitions/tumble";
+@import "petitions/views/shared";
+@import "petitions/views/petition-show";
+@import "petitions/views/petition-create";
+@import "petitions/views/home";
+@import "petitions/views/page";
+@import "petitions/views/sign";
+@import "petitions/views/search";
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_colours.scss b/app/assets/stylesheets/site/govuk/_colours.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_colours.scss
rename to app/assets/stylesheets/site/govuk/_colours.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_conditionals.scss b/app/assets/stylesheets/site/govuk/_conditionals.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_conditionals.scss
rename to app/assets/stylesheets/site/govuk/_conditionals.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_css3.scss b/app/assets/stylesheets/site/govuk/_css3.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_css3.scss
rename to app/assets/stylesheets/site/govuk/_css3.scss
diff --git a/app/assets/stylesheets/govuk_elements/_details.scss b/app/assets/stylesheets/site/govuk/_details.scss
similarity index 94%
rename from app/assets/stylesheets/govuk_elements/_details.scss
rename to app/assets/stylesheets/site/govuk/_details.scss
index c564caab7..1131c2315 100644
--- a/app/assets/stylesheets/govuk_elements/_details.scss
+++ b/app/assets/stylesheets/site/govuk/_details.scss
@@ -1,7 +1,7 @@
 // Details
 // ==========================================================================
 // GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/colours";
+@import "colours";
 
 details {
   display: block;
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_device-pixels.scss b/app/assets/stylesheets/site/govuk/_device-pixels.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_device-pixels.scss
rename to app/assets/stylesheets/site/govuk/_device-pixels.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_font_stack.scss b/app/assets/stylesheets/site/govuk/_font_stack.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_font_stack.scss
rename to app/assets/stylesheets/site/govuk/_font_stack.scss
diff --git a/app/assets/stylesheets/govuk_elements/_forms.scss b/app/assets/stylesheets/site/govuk/_forms.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_elements/_forms.scss
rename to app/assets/stylesheets/site/govuk/_forms.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_grid_layout.scss b/app/assets/stylesheets/site/govuk/_grid_layout.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_grid_layout.scss
rename to app/assets/stylesheets/site/govuk/_grid_layout.scss
diff --git a/app/assets/stylesheets/govuk_elements/_helpers.scss b/app/assets/stylesheets/site/govuk/_helpers.scss
similarity index 80%
rename from app/assets/stylesheets/govuk_elements/_helpers.scss
rename to app/assets/stylesheets/site/govuk/_helpers.scss
index e0fa18887..82da2adf0 100644
--- a/app/assets/stylesheets/govuk_elements/_helpers.scss
+++ b/app/assets/stylesheets/site/govuk/_helpers.scss
@@ -1,11 +1,11 @@
 // Helpers
 // ==========================================================================
 // GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/colours";
-@import "../govuk_frontend_toolkit/shims";
-@import "../govuk_frontend_toolkit/measurements";
-@import "../govuk_frontend_toolkit/typography";
-@import "../govuk_frontend_toolkit/css3";
+@import "colours";
+@import "shims";
+@import "measurements";
+@import "typography";
+@import "css3";
 
 // Path to assets for use with file-url()
 $path: "/public/images/";
diff --git a/app/assets/stylesheets/govuk_elements/_lists.scss b/app/assets/stylesheets/site/govuk/_lists.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_elements/_lists.scss
rename to app/assets/stylesheets/site/govuk/_lists.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_measurements.scss b/app/assets/stylesheets/site/govuk/_measurements.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_measurements.scss
rename to app/assets/stylesheets/site/govuk/_measurements.scss
diff --git a/app/assets/stylesheets/govuk_elements/_panels.scss b/app/assets/stylesheets/site/govuk/_panels.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_elements/_panels.scss
rename to app/assets/stylesheets/site/govuk/_panels.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_shims.scss b/app/assets/stylesheets/site/govuk/_shims.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_shims.scss
rename to app/assets/stylesheets/site/govuk/_shims.scss
diff --git a/app/assets/stylesheets/govuk_elements/_tables.scss b/app/assets/stylesheets/site/govuk/_tables.scss
similarity index 87%
rename from app/assets/stylesheets/govuk_elements/_tables.scss
rename to app/assets/stylesheets/site/govuk/_tables.scss
index 791a0c5f8..d5e90d15b 100644
--- a/app/assets/stylesheets/govuk_elements/_tables.scss
+++ b/app/assets/stylesheets/site/govuk/_tables.scss
@@ -1,8 +1,8 @@
 // Tables
 // ==========================================================================
 // GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/typography";
-@import "../govuk_frontend_toolkit/colours";
+@import "typography";
+@import "colours";
 
 
 table {
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_typography.scss b/app/assets/stylesheets/site/govuk/_typography.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_typography.scss
rename to app/assets/stylesheets/site/govuk/_typography.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/_url-helpers.scss b/app/assets/stylesheets/site/govuk/_url-helpers.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/_url-helpers.scss
rename to app/assets/stylesheets/site/govuk/_url-helpers.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/colours/_organisation.scss b/app/assets/stylesheets/site/govuk/colours/_organisation.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/colours/_organisation.scss
rename to app/assets/stylesheets/site/govuk/colours/_organisation.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/colours/_palette.scss b/app/assets/stylesheets/site/govuk/colours/_palette.scss
similarity index 99%
rename from app/assets/stylesheets/govuk_frontend_toolkit/colours/_palette.scss
rename to app/assets/stylesheets/site/govuk/colours/_palette.scss
index c9441de34..81d040e00 100644
--- a/app/assets/stylesheets/govuk_frontend_toolkit/colours/_palette.scss
+++ b/app/assets/stylesheets/site/govuk/colours/_palette.scss
@@ -48,7 +48,7 @@ $light-blue-25: #d5e8f3;
 
 // Standard palette, greys
 $black: #0b0c0c;
-$grey-1: #56595d;
+$grey-1: #6f777b;
 $grey-2: #bfc1c3;
 $grey-3: #dee0e2;
 $grey-4: #f8f8f8;
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/design-patterns/_alpha-beta.scss b/app/assets/stylesheets/site/govuk/design-patterns/_alpha-beta.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/design-patterns/_alpha-beta.scss
rename to app/assets/stylesheets/site/govuk/design-patterns/_alpha-beta.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/design-patterns/_buttons.scss b/app/assets/stylesheets/site/govuk/design-patterns/_buttons.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/design-patterns/_buttons.scss
rename to app/assets/stylesheets/site/govuk/design-patterns/_buttons.scss
diff --git a/app/assets/stylesheets/govuk_frontend_toolkit/design-patterns/_media-player.scss b/app/assets/stylesheets/site/govuk/design-patterns/_media-player.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_frontend_toolkit/design-patterns/_media-player.scss
rename to app/assets/stylesheets/site/govuk/design-patterns/_media-player.scss
diff --git a/app/assets/stylesheets/govuk_elements/forms/_form-block-labels.scss b/app/assets/stylesheets/site/govuk/forms/_form-block-labels.scss
similarity index 89%
rename from app/assets/stylesheets/govuk_elements/forms/_form-block-labels.scss
rename to app/assets/stylesheets/site/govuk/forms/_form-block-labels.scss
index 6058d32b4..a9bc85206 100644
--- a/app/assets/stylesheets/govuk_elements/forms/_form-block-labels.scss
+++ b/app/assets/stylesheets/site/govuk/forms/_form-block-labels.scss
@@ -1,9 +1,9 @@
 // Large hit area
 // Radio buttons & checkboxes
 
-@import "../../govuk_frontend_toolkit/colours";
-@import "../../govuk_frontend_toolkit/measurements";
-@import "../../govuk_frontend_toolkit/conditionals";
+@import "../colours";
+@import "../measurements";
+@import "../conditionals";
 
 // By default, block labels stack vertically
 .block-label {
diff --git a/app/assets/stylesheets/govuk_elements/forms/_form-date.scss b/app/assets/stylesheets/site/govuk/forms/_form-date.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_elements/forms/_form-date.scss
rename to app/assets/stylesheets/site/govuk/forms/_form-date.scss
diff --git a/app/assets/stylesheets/govuk_elements/forms/_form-multiple-choice.scss b/app/assets/stylesheets/site/govuk/forms/_form-multiple-choice.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_elements/forms/_form-multiple-choice.scss
rename to app/assets/stylesheets/site/govuk/forms/_form-multiple-choice.scss
diff --git a/app/assets/stylesheets/govuk_elements/forms/_form-validation.scss b/app/assets/stylesheets/site/govuk/forms/_form-validation.scss
similarity index 100%
rename from app/assets/stylesheets/govuk_elements/forms/_form-validation.scss
rename to app/assets/stylesheets/site/govuk/forms/_form-validation.scss
diff --git a/app/assets/stylesheets/petitions/_accessibility.scss b/app/assets/stylesheets/site/petitions/_accessibility.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_accessibility.scss
rename to app/assets/stylesheets/site/petitions/_accessibility.scss
diff --git a/app/assets/stylesheets/petitions/_basic.scss b/app/assets/stylesheets/site/petitions/_basic.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_basic.scss
rename to app/assets/stylesheets/site/petitions/_basic.scss
diff --git a/app/assets/stylesheets/petitions/_buttons.scss b/app/assets/stylesheets/site/petitions/_buttons.scss
similarity index 86%
rename from app/assets/stylesheets/petitions/_buttons.scss
rename to app/assets/stylesheets/site/petitions/_buttons.scss
index 9d956ab2e..28088977b 100644
--- a/app/assets/stylesheets/petitions/_buttons.scss
+++ b/app/assets/stylesheets/site/petitions/_buttons.scss
@@ -1,9 +1,9 @@
 // Buttons
 // ==========================================================================
 // GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/design-patterns/buttons";
-@import "../govuk_frontend_toolkit/measurements";
-@import "../govuk_frontend_toolkit/typography";
+@import "../govuk/design-patterns/buttons";
+@import "../govuk/measurements";
+@import "../govuk/typography";
 
 @mixin button-override($colour) {
   @include button($colour);
diff --git a/app/assets/stylesheets/petitions/_colours.scss b/app/assets/stylesheets/site/petitions/_colours.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_colours.scss
rename to app/assets/stylesheets/site/petitions/_colours.scss
diff --git a/app/assets/stylesheets/petitions/_details.scss b/app/assets/stylesheets/site/petitions/_details.scss
similarity index 95%
rename from app/assets/stylesheets/petitions/_details.scss
rename to app/assets/stylesheets/site/petitions/_details.scss
index 28c38cef3..c88b8e46e 100644
--- a/app/assets/stylesheets/petitions/_details.scss
+++ b/app/assets/stylesheets/site/petitions/_details.scss
@@ -1,7 +1,7 @@
 // Details
 // ==========================================================================
 // GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/colours";
+@import "../govuk/colours";
 
 details {
   display: block;
diff --git a/app/assets/stylesheets/petitions/_footer.scss b/app/assets/stylesheets/site/petitions/_footer.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_footer.scss
rename to app/assets/stylesheets/site/petitions/_footer.scss
diff --git a/app/assets/stylesheets/petitions/_forms.scss b/app/assets/stylesheets/site/petitions/_forms.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_forms.scss
rename to app/assets/stylesheets/site/petitions/_forms.scss
diff --git a/app/assets/stylesheets/petitions/_header.scss b/app/assets/stylesheets/site/petitions/_header.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_header.scss
rename to app/assets/stylesheets/site/petitions/_header.scss
diff --git a/app/assets/stylesheets/petitions/_helpers.scss b/app/assets/stylesheets/site/petitions/_helpers.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_helpers.scss
rename to app/assets/stylesheets/site/petitions/_helpers.scss
diff --git a/app/assets/stylesheets/petitions/_icons.scss b/app/assets/stylesheets/site/petitions/_icons.scss
similarity index 99%
rename from app/assets/stylesheets/petitions/_icons.scss
rename to app/assets/stylesheets/site/petitions/_icons.scss
index 9032d20f3..133dda2e5 100644
--- a/app/assets/stylesheets/petitions/_icons.scss
+++ b/app/assets/stylesheets/site/petitions/_icons.scss
@@ -1,6 +1,6 @@
 // Petitions icons
 // GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/device-pixels";
+@import "../govuk/device-pixels";
 
 // Graphics
 // .graphic .graphic-portcullis
diff --git a/app/assets/stylesheets/petitions/_layout.scss b/app/assets/stylesheets/site/petitions/_layout.scss
similarity index 90%
rename from app/assets/stylesheets/petitions/_layout.scss
rename to app/assets/stylesheets/site/petitions/_layout.scss
index 1c9382a10..5710d0340 100644
--- a/app/assets/stylesheets/petitions/_layout.scss
+++ b/app/assets/stylesheets/site/petitions/_layout.scss
@@ -1,9 +1,9 @@
 // Mostly copied from govuk_elements layout
 
 // GOV.UK front end toolkit dependencies
-@import "../govuk_frontend_toolkit/measurements";
-@import "../govuk_frontend_toolkit/conditionals";
-@import "../govuk_frontend_toolkit/grid_layout";
+@import "../govuk/measurements";
+@import "../govuk/conditionals";
+@import "../govuk/grid_layout";
 @import "helpers";
 
 @mixin site-width-container($width) {
diff --git a/app/assets/stylesheets/petitions/_panels.scss b/app/assets/stylesheets/site/petitions/_panels.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_panels.scss
rename to app/assets/stylesheets/site/petitions/_panels.scss
diff --git a/app/assets/stylesheets/petitions/_reset.scss b/app/assets/stylesheets/site/petitions/_reset.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_reset.scss
rename to app/assets/stylesheets/site/petitions/_reset.scss
diff --git a/app/assets/stylesheets/petitions/_search-inline.scss b/app/assets/stylesheets/site/petitions/_search-inline.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_search-inline.scss
rename to app/assets/stylesheets/site/petitions/_search-inline.scss
diff --git a/app/assets/stylesheets/petitions/_tables.scss b/app/assets/stylesheets/site/petitions/_tables.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_tables.scss
rename to app/assets/stylesheets/site/petitions/_tables.scss
diff --git a/app/assets/stylesheets/petitions/_tumble.scss b/app/assets/stylesheets/site/petitions/_tumble.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/_tumble.scss
rename to app/assets/stylesheets/site/petitions/_tumble.scss
diff --git a/app/assets/stylesheets/petitions/_typography.scss b/app/assets/stylesheets/site/petitions/_typography.scss
similarity index 95%
rename from app/assets/stylesheets/petitions/_typography.scss
rename to app/assets/stylesheets/site/petitions/_typography.scss
index 3adca0f74..f9f810f8a 100644
--- a/app/assets/stylesheets/petitions/_typography.scss
+++ b/app/assets/stylesheets/site/petitions/_typography.scss
@@ -1,7 +1,7 @@
 // Mostly taken from govuk_elements typography file
 
-@import "../govuk_frontend_toolkit/typography";
-@import "../govuk_frontend_toolkit/colours";
+@import "../govuk/typography";
+@import "../govuk/colours";
 @import "helpers";
 
 html, body, button, input, table, td, th, main {
diff --git a/app/assets/stylesheets/petitions/views/_home.scss b/app/assets/stylesheets/site/petitions/views/_home.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/_home.scss
rename to app/assets/stylesheets/site/petitions/views/_home.scss
diff --git a/app/assets/stylesheets/petitions/views/_page.scss b/app/assets/stylesheets/site/petitions/views/_page.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/_page.scss
rename to app/assets/stylesheets/site/petitions/views/_page.scss
diff --git a/app/assets/stylesheets/petitions/views/_petition-create.scss b/app/assets/stylesheets/site/petitions/views/_petition-create.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/_petition-create.scss
rename to app/assets/stylesheets/site/petitions/views/_petition-create.scss
diff --git a/app/assets/stylesheets/petitions/views/_petition-show.scss b/app/assets/stylesheets/site/petitions/views/_petition-show.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/_petition-show.scss
rename to app/assets/stylesheets/site/petitions/views/_petition-show.scss
diff --git a/app/assets/stylesheets/petitions/views/_search.scss b/app/assets/stylesheets/site/petitions/views/_search.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/_search.scss
rename to app/assets/stylesheets/site/petitions/views/_search.scss
diff --git a/app/assets/stylesheets/petitions/views/_shared.scss b/app/assets/stylesheets/site/petitions/views/_shared.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/_shared.scss
rename to app/assets/stylesheets/site/petitions/views/_shared.scss
diff --git a/app/assets/stylesheets/petitions/views/_sign.scss b/app/assets/stylesheets/site/petitions/views/_sign.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/_sign.scss
rename to app/assets/stylesheets/site/petitions/views/_sign.scss
diff --git a/app/assets/stylesheets/petitions/views/shared/_petition-item.scss b/app/assets/stylesheets/site/petitions/views/shared/_petition-item.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/shared/_petition-item.scss
rename to app/assets/stylesheets/site/petitions/views/shared/_petition-item.scss
diff --git a/app/assets/stylesheets/petitions/views/shared/_share-petition.scss b/app/assets/stylesheets/site/petitions/views/shared/_share-petition.scss
similarity index 100%
rename from app/assets/stylesheets/petitions/views/shared/_share-petition.scss
rename to app/assets/stylesheets/site/petitions/views/shared/_share-petition.scss