From 45ff46a394a34d57794d16f4b18d01c1568fbc87 Mon Sep 17 00:00:00 2001
From: Peter David Hamilton <pete@peterdavidhamilton.com>
Date: Wed, 25 Oct 2023 13:50:48 +0100
Subject: [PATCH 1/4] Quote icon background

---
 app/assets/stylesheets/prompt.scss | 4 +---
 app/assets/stylesheets/quote.scss  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/prompt.scss b/app/assets/stylesheets/prompt.scss
index 55044112a..1ba5e50bd 100644
--- a/app/assets/stylesheets/prompt.scss
+++ b/app/assets/stylesheets/prompt.scss
@@ -15,9 +15,7 @@ $prompt-hue: govuk-colour('turquoise');
   .svg-inline--fa {
     position: relative;
     display: inline-block;
-    width: 32px; // height of size 2x
-    // top: -16px;
-    // left: -32px;
+    width: 32px;
     top: govuk-spacing(-3);
     left: govuk-spacing(-6);
   }
diff --git a/app/assets/stylesheets/quote.scss b/app/assets/stylesheets/quote.scss
index 7fa722d2e..fd21a2af2 100644
--- a/app/assets/stylesheets/quote.scss
+++ b/app/assets/stylesheets/quote.scss
@@ -4,7 +4,7 @@
   
   blockquote.quote {
     position: relative;
-    border: 3px solid govuk-colour("black");
+    border: 3px solid govuk-colour('black');
     padding: 20px;
     margin: 16px 20px;
 
@@ -33,7 +33,7 @@
       content: '“'; // <-----
       font-size: 8em;
       margin-top: -0.4em;
-      background-color: govuk-colour('white');
+      // background-color: govuk-colour('white');
       line-height: 0.9;
       height: 50px;
       padding-left: 10px;

From 8d2fb042aeda757234ffefda01e0685873ebaae4 Mon Sep 17 00:00:00 2001
From: Peter David Hamilton <pete@peterdavidhamilton.com>
Date: Wed, 25 Oct 2023 14:22:24 +0100
Subject: [PATCH 2/4] Patch section background

---
 app/assets/stylesheets/quote.scss         | 2 +-
 app/assets/stylesheets/section-intro.scss | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/quote.scss b/app/assets/stylesheets/quote.scss
index fd21a2af2..61d148564 100644
--- a/app/assets/stylesheets/quote.scss
+++ b/app/assets/stylesheets/quote.scss
@@ -33,7 +33,7 @@
       content: '“'; // <-----
       font-size: 8em;
       margin-top: -0.4em;
-      // background-color: govuk-colour('white');
+      background-color: govuk-colour('white');
       line-height: 0.9;
       height: 50px;
       padding-left: 10px;
diff --git a/app/assets/stylesheets/section-intro.scss b/app/assets/stylesheets/section-intro.scss
index e5fe10ca0..bc5c7c856 100644
--- a/app/assets/stylesheets/section-intro.scss
+++ b/app/assets/stylesheets/section-intro.scss
@@ -19,5 +19,14 @@
       background-color: $color_dfe-secondary-blue;
     }
   }
+
+  .blockquote-container {
+    blockquote.quote {
+      &:before {
+        background-color: govuk-colour('light-grey');
+      }
+    }
+  }
+
 }
 

From 5d4deaf1b5a9f929c513505c816340aa11abd552 Mon Sep 17 00:00:00 2001
From: Peter David Hamilton <pete@peterdavidhamilton.com>
Date: Fri, 27 Oct 2023 10:02:04 +0100
Subject: [PATCH 3/4] Opt into 2/3 section intro

---
 app/views/markup/_two_thirds.html.slim        |  9 ++++----
 app/views/notes/_form.html.slim               |  2 +-
 .../training/pages/section_intro.html.slim    | 23 ++++++++-----------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/views/markup/_two_thirds.html.slim b/app/views/markup/_two_thirds.html.slim
index 52112839c..69f93d23f 100644
--- a/app/views/markup/_two_thirds.html.slim
+++ b/app/views/markup/_two_thirds.html.slim
@@ -1,5 +1,6 @@
-.govuk-grid-column-two-thirds
-  == left
+.govuk-grid-row
+  .govuk-grid-column-two-thirds
+    == left
 
-.govuk-grid-column-one-third
-  == right
+  .govuk-grid-column-one-third
+    == right
diff --git a/app/views/notes/_form.html.slim b/app/views/notes/_form.html.slim
index 8acec9537..48616a02a 100644
--- a/app/views/notes/_form.html.slim
+++ b/app/views/notes/_form.html.slim
@@ -1,7 +1,7 @@
 
 = form_with(model: note, url: user_notes_path) do |form|
   .govuk-grid-row
-    .govuk-grid-column-two-thirds-from-desktop
+    .govuk-grid-column-three-quarters
       .prompt
         .govuk-grid-row
           .govuk-grid-column-one-quarter
diff --git a/app/views/training/pages/section_intro.html.slim b/app/views/training/pages/section_intro.html.slim
index e5c11ca14..e890eabb1 100644
--- a/app/views/training/pages/section_intro.html.slim
+++ b/app/views/training/pages/section_intro.html.slim
@@ -6,18 +6,15 @@
 
 = render 'debug'
 
-.govuk-grid-row
-  .govuk-grid-column-full
-    #section-intro-panel
-      .govuk-grid-row
-          h1.govuk-heading-xl= content.heading
+#section-intro-panel
+  .govuk-grid-row
+    .govuk-grid-column-full
+      h1.govuk-heading-xl= content.heading
 
-      .govuk-grid-row
-        .govuk-grid-column-two-thirds
-          = m(content.body)
+  = m(content.body)
 
-      .govuk-grid-row
-        .govuk-grid-column-full
-          .govuk-button-group
-            = link_to_previous
-            = link_to_next
+  .govuk-grid-row
+    .govuk-grid-column-full
+      .govuk-button-group
+        = link_to_previous
+        = link_to_next

From 83343c7753424290c7ac90ef446f1a7611b26196 Mon Sep 17 00:00:00 2001
From: Peter David Hamilton <pete@peterdavidhamilton.com>
Date: Fri, 27 Oct 2023 10:24:06 +0100
Subject: [PATCH 4/4] Update spec

---
 spec/helpers/content_helper_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/helpers/content_helper_spec.rb b/spec/helpers/content_helper_spec.rb
index 3fcec47b3..925c37b02 100644
--- a/spec/helpers/content_helper_spec.rb
+++ b/spec/helpers/content_helper_spec.rb
@@ -125,7 +125,7 @@
         end
 
         it 'builds semantic markup' do
-          expect(html).to eq '<div class="govuk-grid-column-two-thirds"><p class="govuk-body-m">Description of an image</p></div><div class="govuk-grid-column-one-third"><p class="govuk-body-m"><img src="/path/to/image" alt="image title"></p></div>'
+          expect(html).to eq '<div class="govuk-grid-row"><div class="govuk-grid-column-two-thirds"><p class="govuk-body-m">Description of an image</p></div><div class="govuk-grid-column-one-third"><p class="govuk-body-m"><img src="/path/to/image" alt="image title"></p></div></div>'
         end
       end
     end