Remove brand colour link class and make branded share icons black

Share links need to have a black icon with blue links, but the no 10 page needs to retain black links.

app/assets/stylesheets/govuk_publishing_components/components/_share-links.scss

@@ -115,3 +115,15 @@ $column-width: 9.5em;
     @include govuk-font(19, $weight: bold);
   }
 }
+
+.gem-c-share-links--branded {
+  .gem-c-share-links__link-icon {
+    color: govuk-colour("black");
+  }
+}
+
+.gem-c-share-links--black-links {
+  .gem-c-share-links__label {
+    color: govuk-colour("black");
+  }
+}

app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss

@@ -1,21 +1,6 @@
 @mixin organisation-brand-colour {
   @each $organisation in map-keys($govuk-colours-organisations) {
     .brand--#{$organisation} {
-      .brand__color {
-        color: govuk-organisation-colour($organisation);
-
-        &:link,
-        &:visited,
-        &:active {
-          color: govuk-organisation-colour($organisation);
-        }
-
-        &:hover,
-        &:focus {
-          color: $govuk-focus-text-colour;
-        }
-      }
-
       // the & declaration allows border-color to also be applied to the parent
       // element as required by the heading component, adds 2KB to the CSS
       &.brand__border-color,
@@ -32,21 +17,6 @@
 // the "the" prefix was dropped, this is maintained here for backwards
 // compatibility
 .brand--the-office-of-the-leader-of-the-house-of-commons {
-  .brand__color {
-    color: govuk-organisation-colour("office-of-the-leader-of-the-house-of-commons");
-
-    &:link,
-    &:visited,
-    &:active {
-      color: govuk-organisation-colour("office-of-the-leader-of-the-house-of-commons");
-    }
-
-    &:hover,
-    &:focus {
-      color: $govuk-focus-text-colour;
-    }
-  }
-
   &.brand__border-color,
   .brand__border-color {
     border-color: govuk-organisation-colour("office-of-the-leader-of-the-house-of-commons", $contrast-safe: false);
@@ -56,9 +26,8 @@
 // so are written out here for our use
 
 .brand--prime-ministers-office-10-downing-street {
-  .brand__color {
-    color: govuk-colour("black");
 
+  .brand__color {
     &:link,
     &:visited,
     &:active {

app/views/govuk_publishing_components/components/_share_links.html.erb

@@ -11,14 +11,17 @@
   square_icons ||= false
 
   brand ||= false
-  brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
+
+  if brand == "prime-ministers-office-10-downing-street"
+    black_links = true
+  end
 
   classes = %w(gem-c-share-links govuk-!-display-none-print)
   classes << "gem-c-share-links--stacked" if stacked
   classes << "gem-c-share-links--columns" if columns
   classes << "gem-c-share-links--square-icons" if square_icons
-
-  classes << brand_helper.brand_class
+  classes << "gem-c-share-links--branded" if brand
+  classes << "gem-c-share-links--black-links" if black_links
 
   data_attributes ||= {}
   ((data_attributes[:module] ||= "") << " " << "ga4-link-tracker").strip! if track_as_sharing || track_as_follow
@@ -74,7 +77,7 @@
             target: "_blank",
             rel: "noopener noreferrer external",
             data: data_attributes,
-            class: "govuk-link govuk-link--no-underline gem-c-share-links__link #{brand_helper.color_class}" do %>
+            class: "govuk-link govuk-link--no-underline gem-c-share-links__link" do %>
             <span class="gem-c-share-links__link-icon">
               <% if link[:icon] == 'facebook' %>
                 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" width="0" height="0" class="gem-c-share-links__svg">
@@ -113,7 +116,7 @@
                   <path fill="currentColor" d="M36.92,0A36.92,36.92,0,1,0,73.84,36.92,36.92,36.92,0,0,0,36.92,0ZM56.3,48.27a1.42,1.42,0,0,1-1.42,1.42h-19v9.18l-9.18-9.18H19a1.43,1.43,0,0,1-1.43-1.43V20.52A1.43,1.43,0,0,1,19,19.09H54.88a1.43,1.43,0,0,1,1.42,1.42Z"/>
                 </svg>
               <% end %>
-            </span><%= tag.span(class: "gem-c-share-links__label") do %><%= link_text %><% end %><% end %>
+            </span><%= tag.span(class: "gem-c-share-links__label #{}") do %><%= link_text %><% end %><% end %>
         </li>
       <% end %>
     </ul>

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

@@ -81,9 +81,21 @@ examples:
         }
       ]
   with_branding:
-    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.
+    description: Black branding can be added to the component icons as shown.
     data:
-      brand: 'attorney-generals-office'
+      brand: true
+      links: [
+        {
+          href: 'share',
+          text: 'Follow the Attorney General on Twitter',
+          hidden_text: '',
+          icon: 'twitter'
+        }
+      ]
+  with_black_links:
+    description: Black branding can be added to the links as shown.
+    data:
+      black_links: true
       links: [
         {
           href: 'share',
@@ -208,7 +220,7 @@ examples:
   with_all_icons:
     data:
       stacked: true
-      brand: 'hm-treasury'
+      brand: true
       links: [
         {
           href: '/facebook-share-link',

spec/components/share_links_spec.rb

@@ -101,8 +101,13 @@ def links
   end
 
   it "adds branding correctly" do
-    render_component(links: [links[0]], brand: "attorney-generals-office")
-    assert_select ".gem-c-share-links.brand--attorney-generals-office .gem-c-share-links__link.brand__color"
+    render_component(links: [links[0]], brand: true)
+    assert_select ".gem-c-share-links span.gem-c-share-links__link-icon.gem-c-share-links--black"
+  end
+
+  it "has no branding by default" do
+    render_component(links: [links[0]])
+    assert_select ".gem-c-share-links span.gem-c-share-links__link-icon.gem-c-share-links--black", false
   end
 
   it "arranges in columns" do