govuk_publishing_components 29.6.0 → 29.9.0

data/app/assets/stylesheets/govuk_publishing_components/components/_cards.scss

@@ -50,12 +50,19 @@
   // We use grid to split the container into column widths, so manage the horizontal spacing with
   // internal margins.
   margin: 0 govuk-spacing(3);
-  padding: govuk-spacing(3) 0 govuk-spacing(6) 0;
+  padding: govuk-spacing(1) 0 govuk-spacing(4) 0;
+}
+
+.gem-c-cards__list-item-wrapper {
+  // this wrapper ensures that the clickable area of the card only
+  // covers the area of the card containing text so in a grid of cards
+  // there is space above and below each link
+  padding: govuk-spacing(2) govuk-spacing(6) govuk-spacing(2) 0;
   position: relative;
 }
 
 .gem-c-cards__sub-heading {
-  margin: 0 govuk-spacing(6) govuk-spacing(2) 0;
+  margin-bottom: govuk-spacing(2);
 }
 
 .gem-c-cards__link {
@@ -79,7 +86,7 @@
     height: $dimension;
     position: absolute;
     right: govuk-spacing(1);
-    top: govuk-spacing(4);
+    top: govuk-spacing(3);
     @include prefixed-transform($rotate: 45deg);
     width: $dimension;
   }
@@ -98,5 +105,5 @@
 }
 
 .gem-c-cards__description {
-  margin: 0;
+  margin: 0 govuk-spacing(-6) 0 0;
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss

@@ -816,7 +816,7 @@ $button-pipe-colour: darken(govuk-colour("mid-grey"), 20%);
 
 .gem-c-layout-super-navigation-header__navigation-second-items--topics {
   @include govuk-media-query($from: "desktop") {
-    @include columns($items: 17, $columns: 2, $selector: "li", $flow: column);
+    @include columns($items: 16, $columns: 2, $selector: "li", $flow: column);
   }
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss

@@ -16,7 +16,7 @@
   // This block is duplicated from Whitehall as a transitional step, see the
   // commit message for 2d893c10ee3f2cab27162b9aba38b12379a71d07 before making
   // changes, original version:
-  // https://github.com/alphagov/whitehall/blob/master/app/assets/stylesheets/frontend/helpers/_attachment.scss
+  // https://github.com/alphagov/whitehall/blob/main/app/assets/stylesheets/frontend/helpers/_attachment.scss
   $thumbnail-width: 99px;
 
   .attachment {

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -13,8 +13,6 @@ module GovukPublishingComponents
         frontend
         government-frontend
         govspeak-preview
-        govuk-account-manager-prototype
-        govuk-coronavirus-vulnerable-people-form
         info-frontend
         licence-finder
         manuals-frontend
@@ -32,10 +30,9 @@ module GovukPublishingComponents
       gem_path = Gem.loaded_specs["govuk_publishing_components"].full_gem_path
       gem_path = Dir.pwd if ENV["MAIN_COMPONENT_GUIDE"]
       host_dir = File.expand_path("..")
-      path = File.expand_path("..", gem_path)
 
       @in_application = false
-      @in_application = true unless path.to_s == host_dir.to_s
+      @in_application = true unless ENV["MAIN_COMPONENT_GUIDE"]
 
       components = AuditComponents.new(gem_path, false)
       applications = analyse_applications(host_dir, application_dirs)

data/app/models/govuk_publishing_components/audit_components.rb

@@ -12,29 +12,40 @@ module GovukPublishingComponents
   private
 
     def compile_data(path, simple)
+      # simple is used to reduce effort (and therefore page load time) required
+      # when loading auditing summary on the main component guide page
       @simple = simple
-      templates_path = "app/views/govuk_publishing_components/components"
-      stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components"
-      print_stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components/print"
-      javascripts_path = "app/assets/javascripts/govuk_publishing_components/components"
-      tests_path = "spec/components"
-      js_tests_path = "spec/javascripts/components"
-
-      templates = Dir["#{path}/#{templates_path}/*.erb"]
-      stylesheets = Dir["#{path}/#{stylesheets_path}/*.scss"]
-      print_stylesheets = Dir["#{path}/#{print_stylesheets_path}/*.scss"]
-      javascripts = Dir["#{path}/#{javascripts_path}/*.js"]
-      tests = Dir["#{path}/#{tests_path}/*.rb"]
-      js_tests = Dir["#{path}/#{js_tests_path}/*.js"]
-
-      @templates_full_path = "#{path}/#{templates_path}/"
-
-      @components = find_files(templates, [path, templates_path].join("/"))
-      @component_stylesheets = find_files(stylesheets, [path, stylesheets_path].join("/"))
-      @component_print_stylesheets = find_files(print_stylesheets, [path, print_stylesheets_path].join("/"))
-      @component_javascripts = find_files(javascripts, [path, javascripts_path].join("/"))
-      @component_tests = find_files(tests, [path, tests_path].join("/"))
-      @component_js_tests = find_files(js_tests, [path, js_tests_path].join("/"))
+
+      # paths to key file locations
+      @templates_path = "app/views/govuk_publishing_components/components"
+      @stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components"
+      @print_stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components/print"
+      @javascripts_path = "app/assets/javascripts/govuk_publishing_components/components"
+      @tests_path = "spec/components"
+      @js_tests_path = "spec/javascripts/components"
+      @helpers_path = "lib/govuk_publishing_components/presenters"
+
+      # get all files in key file locations
+      templates = Dir["#{path}/#{@templates_path}/*.erb"]
+      stylesheets = Dir["#{path}/#{@stylesheets_path}/*.scss"]
+      print_stylesheets = Dir["#{path}/#{@print_stylesheets_path}/*.scss"]
+      javascripts = Dir["#{path}/#{@javascripts_path}/*.js"]
+      tests = Dir["#{path}/#{@tests_path}/*.rb"]
+      js_tests = Dir["#{path}/#{@js_tests_path}/*.js"]
+      helpers = Dir["#{path}/#{@helpers_path}/*_helper.rb"]
+
+      @templates_full_path = "#{path}/#{@templates_path}/"
+
+      # find the cleaned names of components in key file locations
+      # i.e. will show that 'component name' has a stylesheet
+      # standardised like this to be used later for easier comparison
+      @components = clean_files(templates, [path, @templates_path].join("/"))
+      @component_stylesheets = clean_files(stylesheets, [path, @stylesheets_path].join("/"))
+      @component_print_stylesheets = clean_files(print_stylesheets, [path, @print_stylesheets_path].join("/"))
+      @component_javascripts = clean_files(javascripts, [path, @javascripts_path].join("/"))
+      @component_tests = clean_files(tests, [path, @tests_path].join("/"))
+      @component_js_tests = clean_files(js_tests, [path, @js_tests_path].join("/"))
+      @component_helpers = clean_files(helpers, [path, @helpers_path].join("/"))
 
       {
         gem_found: true,
@@ -44,12 +55,13 @@ module GovukPublishingComponents
         component_javascripts: @component_javascripts,
         component_tests: @component_tests,
         component_js_tests: @component_js_tests,
+        component_helpers: @component_helpers,
         components_containing_components: find_all_partials_in(templates),
         component_listing: list_all_component_details,
       }
     end
 
-    def find_files(files, replace)
+    def clean_files(files, replace)
       files.map { |file| clean_file_name(file.gsub(replace, "")) }.sort
     end
 
@@ -61,6 +73,7 @@ module GovukPublishingComponents
         .gsub(".js", "")
         .gsub("spec", "")
         .gsub(".rb", "")
+        .gsub("helper", "")
         .strip
     end
 
@@ -72,11 +85,14 @@ module GovukPublishingComponents
         .tr('\"\'', "")
     end
 
+    # create link to component guide page for a given component e.g. 'component name'
     def get_component_link(component)
       "/component-guide/#{component.gsub(' ', '_')}"
     end
 
     def find_all_partials_in(templates)
+      return [] if @simple
+
       components = []
 
       templates.each do |template|
@@ -142,6 +158,7 @@ module GovukPublishingComponents
           javascript: check_component_has("javascript", component),
           tests: check_component_has("test", component),
           js_tests: check_component_has("js_test", component),
+          helper: check_component_has("helper", component),
         }
       end
 
@@ -154,8 +171,28 @@ module GovukPublishingComponents
       look_in = @component_javascripts if a_thing == "javascript"
       look_in = @component_tests if a_thing == "test"
       look_in = @component_js_tests if a_thing == "js_test"
+      look_in = @component_helpers if a_thing == "helper"
+
+      if look_in.include?(component)
+        return get_asset_link(a_thing, component)
+      end
+
+      false
+    end
 
-      true if look_in.include?(component)
+    def get_asset_link(a_thing, component)
+      url = "https://github.com/alphagov"
+      repo = "govuk_publishing_components"
+      blob = "blob/main"
+      link = nil
+      link = "#{url}/#{repo}/#{blob}/#{@stylesheets_path}/_#{component.gsub(' ', '-')}.scss" if a_thing == "stylesheet"
+      link = "#{url}/#{repo}/#{blob}/#{@print_stylesheets_path}/_#{component.gsub(' ', '-')}.scss" if a_thing == "print_stylesheet"
+      link = "#{url}/#{repo}/#{blob}/#{@javascripts_path}/#{component.gsub(' ', '-')}.js" if a_thing == "javascript"
+      link = "#{url}/#{repo}/#{blob}/#{@tests_path}/#{component.gsub(' ', '_')}_spec.rb" if a_thing == "test"
+      link = "#{url}/#{repo}/#{blob}/#{@js_tests_path}/#{component.gsub(' ', '-')}-spec.js" if a_thing == "js_test"
+      link = "#{url}/#{repo}/#{blob}/#{@helpers_path}/#{component.gsub(' ', '_')}_helper.rb" if a_thing == "helper"
+
+      link
     end
   end
 end

data/app/views/govuk_publishing_components/audit/_applications.html.erb

@@ -32,6 +32,7 @@
 
     <% accordion_content = capture do %>
       <% if application[:application_found] %>
+        <% github_link = 'https://github.com/alphagov/' + application[:name] + '/blob/main/' %>
         <% application[:warnings].each do |warning| %>
           <p class="govuk-body">
             <strong class="govuk-tag">Warn</strong>
@@ -74,7 +75,9 @@
           <p class="govuk-body">This shows instances of `gem-c-` classes found in the application. If a reference is found in a stylesheet or in code a warning is created, as this could be a style override or hard coded component markup.</p>
           <ul class="govuk-list govuk-list--bullet">
             <% application[:gem_style_references].each do |ref| %>
-              <li><%= ref %></li>
+              <li>
+                <%= link_to ref, github_link + ref, class: 'govuk-link' %>
+              </li>
             <% end %>
           </ul>
         <% end %>
@@ -86,10 +89,12 @@
             margin_bottom: 4,
             heading_level: 3,
           } %>
-          <p class="govuk-body">This shows JavaScript files that might contain jQuery, which we are trying to remove our dependency on.</p>
+          <p class="govuk-body">This shows JavaScript files that might contain jQuery, which we are trying to remove.</p>
           <ul class="govuk-list govuk-list--bullet">
             <% application[:jquery_references].each do |ref| %>
-              <li><%= ref %></li>
+              <li>
+                <%= link_to ref, github_link + ref, class: 'govuk-link' %>
+              </li>
             <% end %>
           </ul>
         <% end %>

data/app/views/govuk_publishing_components/audit/_component_contents.html.erb

@@ -0,0 +1,82 @@
+<%
+  total_components = components.length
+  components_with_stylesheet = 0
+  components_with_print_stylesheet = 0
+  components_with_javascript = 0
+  components_with_test = 0
+  components_with_javascript_test = 0
+  components_with_helper = 0
+
+  components.each do |component|
+    components_with_stylesheet += 1 if component[:stylesheet]
+    components_with_print_stylesheet += 1 if component[:print_stylesheet]
+    components_with_javascript += 1 if component[:javascript]
+    components_with_test += 1 if component[:tests]
+    components_with_javascript_test += 1 if component[:js_tests]
+    components_with_helper += 1 if component[:helper]
+  end
+%>
+<table class="govuk-table">
+  <thead class="govuk-table__head">
+    <tr class="govuk-table__row">
+      <th scope="col" class="govuk-table__header sticky-table-header">Component (<%= total_components %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">CSS (<%= components_with_stylesheet %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Print CSS (<%= components_with_print_stylesheet %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">JS (<%= components_with_javascript %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Test (<%= components_with_test %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">JS test (<%= components_with_javascript_test %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Helper (<%= components_with_helper %>)</th>
+    </tr>
+  </thead>
+  <tbody class="govuk-table__body">
+    <% components.each do |component| %>
+      <tr class="govuk-table__row">
+        <th scope="row" class="govuk-table__header">
+          <a href="<%= component[:link] %>" class="govuk-link"><%= component[:name] %></a>
+        </th>
+        <td class="govuk-table__cell">
+          <% if component[:stylesheet] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:stylesheet] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:print_stylesheet] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:print_stylesheet] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:javascript] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:javascript] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:tests] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:tests] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:js_tests] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:js_tests] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:helper] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:helper] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/govuk_publishing_components/audit/_components.html.erb

@@ -1,6 +1,6 @@
 <% if @other_applications %>
   <%= render "govuk_publishing_components/components/heading", {
-    text: "Components",
+    text: "Components in the gem",
     font_size: "l",
     margin_bottom: 6,
   } %>
@@ -10,52 +10,7 @@
   <% component_items = [] %>
 
   <% component_files = capture do %>
-    <table class="govuk-table">
-      <thead class="govuk-table__head">
-        <tr class="govuk-table__row">
-          <th scope="col" class="govuk-table__header sticky-table-header">Component</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Stylesheet</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Print stylesheet</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">JS</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Test</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">JS test</th>
-        </tr>
-      </thead>
-      <tbody class="govuk-table__body">
-        <% @components[:component_listing].each do |component| %>
-          <tr class="govuk-table__row">
-            <th scope="row" class="govuk-table__header">
-              <a href="<%= component[:link] %>" class="govuk-link"><%= component[:name] %></a>
-            </th>
-            <td class="govuk-table__cell">
-              <% if component[:stylesheet] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:print_stylesheet] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:javascript] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:tests] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:js_tests] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+    <%= render partial: "component_contents", locals: { components: @components[:component_listing] } %>
   <% end %>
 
   <%

data/app/views/govuk_publishing_components/component_guide/index.html.erb

@@ -20,7 +20,7 @@
   <p>Components are packages of template, style, behaviour and documentation that live in your application.</p>
   <p>See the <a href="https://github.com/alphagov/govuk_publishing_components">govuk_publishing_components gem</a> for further details, or <a href="https://docs.publishing.service.gov.uk/manual/components.html#component-guides">a list of all component guides</a>.</p>
   <ul>
-    <li>Read about how to <a href="https://github.com/alphagov/govuk_publishing_components/blob/master/docs/publishing-to-rubygems.md">release a new version of the gem</a></li>
+    <li>Read about how to <a href="https://github.com/alphagov/govuk_publishing_components/blob/main/docs/publishing-to-rubygems.md">release a new version of the gem</a></li>
     <% if ENV["MAIN_COMPONENT_GUIDE"] %>
       <li><a href="/component-guide/audit">View component audits</a></li>
     <% end %>
@@ -105,5 +105,5 @@
 </ul>
 
 <div class="component-markdown">
-  <p class="govuk-body">If you cannot find a suitable component consider extending an existing component or <a href="https://github.com/alphagov/govuk_publishing_components/blob/master/docs/generate-a-new-component.md">creating a new one</a>.</p>
+  <p class="govuk-body">If you cannot find a suitable component consider extending an existing component or <a href="https://github.com/alphagov/govuk_publishing_components/blob/main/docs/generate-a-new-component.md">creating a new one</a>.</p>
 </div>

data/app/views/govuk_publishing_components/component_guide/show.html.erb

@@ -13,7 +13,7 @@
       <% if !@component_doc.accessibility_criteria.present? %>
         <div class="component-violation">
           <h2 class="component-violation__title">This component is not valid</h2>
-          <a class="component-violation__link" href="https://github.com/alphagov/govuk_publishing_components/blob/master/docs/accessibility_acceptance_criteria.md">Please define accessibility acceptance criteria for this component.</a>
+          <a class="component-violation__link" href="https://github.com/alphagov/govuk_publishing_components/blob/main/docs/accessibility_acceptance_criteria.md">Please define accessibility acceptance criteria for this component.</a>
         </div>
       <% end %>
       <%= render 'govuk_publishing_components/components/lead_paragraph', text: @component_doc.description %>

data/app/views/govuk_publishing_components/components/_attachment.html.erb

@@ -1,5 +1,5 @@
 <%
-  attachment = GovukPublishingComponents::Presenters::Attachment.new(attachment)
+  attachment = GovukPublishingComponents::Presenters::AttachmentHelper.new(attachment)
   target ||= "_self"
   hide_opendocument_metadata ||= false
   hide_order_copy_link ||= false

data/app/views/govuk_publishing_components/components/_attachment_link.html.erb

@@ -1,5 +1,5 @@
 <%
-  attachment = GovukPublishingComponents::Presenters::Attachment.new(attachment)
+  attachment = GovukPublishingComponents::Presenters::AttachmentHelper.new(attachment)
   target ||= nil
   data_attributes ||= {}
   attributes = []

data/app/views/govuk_publishing_components/components/_cards.html.erb

@@ -31,17 +31,19 @@
         end
       %>
         <li class="gem-c-cards__list-item">
-          <%= content_tag("h#{sub_heading_level}", class: "gem-c-cards__sub-heading govuk-heading-s") do %>
-            <%= 
-              link_to link[:text], link[:path], 
-              class: "govuk-link gem-c-cards__link", 
-              data: link[:data_attributes],
-              "data-track-count": "cardLink"
-            %>
-          <% end %>
-          <% if item[:description] %>
-            <p class="govuk-body gem-c-cards__description"><%= item[:description] %></p>
-          <% end %>
+          <div class="gem-c-cards__list-item-wrapper">
+            <%= content_tag("h#{sub_heading_level}", class: "gem-c-cards__sub-heading govuk-heading-s") do %>
+              <%=
+                link_to link[:text], link[:path],
+                class: "govuk-link gem-c-cards__link",
+                data: link[:data_attributes],
+                "data-track-count": "cardLink"
+              %>
+            <% end %>
+            <% if item[:description] %>
+              <p class="govuk-body gem-c-cards__description"><%= item[:description] %></p>
+            <% end %>
+          </div>
         </li>
       <% end %>
     <% end %>

data/app/views/govuk_publishing_components/components/_summary_list.html.erb

@@ -107,20 +107,19 @@
             <% if edit_link && delete_link %>
               <%= tag.dd class: "govuk-summary-list__actions" do %>
                 <%= tag.ul class: "govuk-summary-list__actions-list" do %>
-                  <% if item.fetch(:edit, {}).any? %>
+                  <% if edit_link %>
                     <%= tag.li class: "govuk-summary-list__actions-list-item" do %>
                       <%= edit_link %>
                     <% end %>
                   <% end %>
-                  <% if item.fetch(:delete, {}).any? %>
+                  <% if delete_link %>
                     <%= tag.li class: "govuk-summary-list__actions-list-item" do %>
                       <%= delete_link %>
                     <% end %>
                   <% end %>
                 <% end %>
               <% end %>
-            <% else %>
-            <% if edit_link || delete_link %>
+            <% elsif edit_link || delete_link %>
               <%= tag.dd class: "govuk-summary-list__actions" do %>
                 <%= edit_link %>
                 <%= delete_link %>
@@ -130,7 +129,7 @@
         <% end %>
       <% end %>
     <% end %>
-  <% end %>
+
     <%= tag.div block, class: "gem-c-summary__block" if block %>
     <% end %>
 <% end %>

data/app/views/govuk_publishing_components/components/docs/contents_list.yml

@@ -191,7 +191,7 @@ examples:
     context:
       right_to_left: true
   with_branding:
-    description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) for more details.
+    description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) for more details.
     data:
       brand: 'department-for-environment-food-rural-affairs'
       format_numbers: true

data/app/views/govuk_publishing_components/components/docs/document_list.yml

@@ -2,7 +2,7 @@ name: Document list
 description: An ordered list of documents including a document type, when updated and a link.
 body: |
   Outputs a list to documents, based on an array of document data. A "document" in this context can be an asset (such as a ODT or other downloadable document) or a web page.
-  
+
   The component can display:
 
   * a document title
@@ -116,7 +116,7 @@ examples:
           public_updated_at: 2017-07-19 15:01:48
           document_type: 'Statutory guidance'
   with_branding:
-    description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) for more details.
+    description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) for more details.
     data:
       brand: 'attorney-generals-office'
       items:
@@ -308,9 +308,9 @@ examples:
   with_rel_link_attribute:
     description: |
       The [rel attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel) is an option attribute to dictate the relationship between the document being linked to and the current page. This is predominantly used by search engines to help index journeys through a website.
-      
+
       On GOV.UK, this is typically used to dictate an external website being linked to with `rel="external"`, however this component supports:
-      
+
       - external
       - nofollow
       - noopener

data/app/views/govuk_publishing_components/components/docs/heading.yml

@@ -65,7 +65,7 @@ examples:
       padding: true
       border_top: 2
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown, if a top border is included.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown, if a top border is included.
     data:
       text: 'Branding'
       brand: 'department-for-environment-food-rural-affairs'

data/app/views/govuk_publishing_components/components/docs/image_card.yml

@@ -166,7 +166,7 @@ examples:
       heading_text: 'John McJohnson'
       description: 'Deputy director for Parks and Small Trees'
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown.
     data:
       brand: "department-for-work-pensions"
       href: "/again-not-a-page"

data/app/views/govuk_publishing_components/components/docs/meta_tags.yml

@@ -4,9 +4,9 @@ body: |
   This takes a content-store links hash like object which it can then turn into
   the correct analytics identifier metadata tags.
 
-  These are additionally used by the <a href="https://github.com/alphagov/govuk-browser-extension">GOV.UK browser extension</a> to provide details about a given page. 
+  These are additionally used by the <a href="https://github.com/alphagov/govuk-browser-extension">GOV.UK browser extension</a> to provide details about a given page.
 
-  The code which reads the meta tags can be found <a href="https://github.com/alphagov/govuk_publishing_components/blob/master/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js">in custom-dimensions.js</a>.
+  The code which reads the meta tags can be found <a href="https://github.com/alphagov/govuk_publishing_components/blob/main/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js">in custom-dimensions.js</a>.
 accessibility_criteria: |
   The analytics meta tags component should not be visible to any users.
 display_html: true
@@ -24,7 +24,7 @@ examples:
   with_content_history_tags:
     description: |
       The tags in this object will generate the `content-has-history` tag, set to true. This tag is triggered when either, within `content_item`:
-      
+
       1. `public_updated_at` and `first_public_at` within `details` are both present and they aren't the same value
       2. `change_history` within `details` is present and it has a value of more than 1
 
@@ -121,4 +121,4 @@ examples:
       content_item:
         links:
           secondary_to_step_navs:
-            - content_id: "22222222-2222-2222-2222-222222222222"
+            - content_id: "22222222-2222-2222-2222-222222222222"

data/app/views/govuk_publishing_components/components/docs/metadata.yml

@@ -359,7 +359,7 @@ examples:
       dark_background: true
   with_custom_margin_bottom:
     description: |
-      The component accepts a number for margin bottom from `0` to `9` (`0px` to `60px`) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to the `margin-bottom` values defined in the [responsive-bottom-margin mixin](https://github.com/alphagov/govuk_publishing_components/blob/master/app/assets/stylesheets/govuk_publishing_components/components/mixins/_margins.scss#L1)
+      The component accepts a number for margin bottom from `0` to `9` (`0px` to `60px`) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to the `margin-bottom` values defined in the [responsive-bottom-margin mixin](https://github.com/alphagov/govuk_publishing_components/blob/main/app/assets/stylesheets/govuk_publishing_components/components/mixins/_margins.scss#L1)
     data:
       first_published: 14 June 2014
       last_updated: 10 September 2015

data/app/views/govuk_publishing_components/components/docs/share_links.yml

@@ -80,7 +80,7 @@ examples:
         }
       ]
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown.
     data:
       brand: 'attorney-generals-office'
       links: [

data/app/views/govuk_publishing_components/components/docs/subscription_links.yml

@@ -46,7 +46,7 @@ examples:
       email_signup_link: '/foreign-travel-advice/singapore/email-signup'
       feed_link_box_value: 'https://www.gov.uk/government/organisations/attorney-generals-office.atom'
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown.
     data:
       brand: 'attorney-generals-office'
       email_signup_link: '/foreign-travel-advice/singapore/email-signup'