From 1de83823d2b701aae2d36adf73f6a5b9e71e47c6 Mon Sep 17 00:00:00 2001
From: owenatgov <owen.jones@digital.cabinet-office.gov.uk>
Date: Tue, 15 Sep 2020 18:25:23 +0100
Subject: [PATCH 1/2] Remove ordered list markup for organisation logos

---
 .../stylesheets/helpers/_organisation-logos.scss     |  6 +-----
 app/views/content_items/html_publication.html.erb    | 12 +++++-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/helpers/_organisation-logos.scss b/app/assets/stylesheets/helpers/_organisation-logos.scss
index 1e8fcf956..4bcbd92ed 100644
--- a/app/assets/stylesheets/helpers/_organisation-logos.scss
+++ b/app/assets/stylesheets/helpers/_organisation-logos.scss
@@ -9,11 +9,7 @@
 
 .organisation-logos__logo {
   padding-bottom: govuk-spacing(3);
+  margin-right: govuk-spacing(3);
   flex-basis: 25%;
   min-width: 130px;
 }
-
-.organisation-logo__inner {
-  max-width: 215px;
-  padding-right: govuk-spacing(3);
-}
diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb
index b6cbcf076..6da410c8b 100644
--- a/app/views/content_items/html_publication.html.erb
+++ b/app/views/content_items/html_publication.html.erb
@@ -10,17 +10,15 @@
 
 <% if @content_item.organisations %>
   <div class="publication-external">
-    <ol class="organisation-logos">
+    <ul class="organisation-logos">
       <% @content_item.organisations.each do |organisation| %>
-      <% logo_attributes = @content_item.organisation_logo(organisation) %>
-      <% next unless logo_attributes %>
+        <% logo_attributes = @content_item.organisation_logo(organisation) %>
+        <% next unless logo_attributes %>
         <li class="organisation-logos__logo">
-          <div class="organisation-logo__inner">
-            <%= render 'govuk_publishing_components/components/organisation_logo', logo_attributes %>
-          </div>
+          <%= render 'govuk_publishing_components/components/organisation_logo', logo_attributes %>
         </li>
       <% end %>
-    </ol>
+    </ul>
   </div>
 <% end %>
 

From f4253a215aaeef15480fdac8b8b9ebe925db8e21 Mon Sep 17 00:00:00 2001
From: owenatgov <owen.jones@digital.cabinet-office.gov.uk>
Date: Thu, 17 Sep 2020 15:48:30 +0100
Subject: [PATCH 2/2] Update tests

---
 test/integration/html_publication_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/html_publication_test.rb b/test/integration/html_publication_test.rb
index 28f335229..e5eeb3131 100644
--- a/test/integration/html_publication_test.rb
+++ b/test/integration/html_publication_test.rb
@@ -69,7 +69,7 @@ class HtmlPublicationTest < ActionDispatch::IntegrationTest
   end
 
   def assert_has_component_organisation_logo_with_brand(brand, index = 1)
-    within("li.organisation-logos__logo:nth-of-type(#{index})") do
+    within(".organisation-logos__logo:nth-of-type(#{index})") do
       assert page.has_css?(".gem-c-organisation-logo.brand--#{brand}")
     end
   end