From c1437df04b1f73257886882a0d013796437ebcc9 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 31 Jan 2023 11:31:28 +0000
Subject: [PATCH] Issue #3226047 by Gauravvv, IndrajithKB, kostyashupenko,
 markconroy, longwave: Olivero: Remove svg from
 block--system-powered-by-block.html.twig file

---
 core/themes/olivero/css/components/powered-by-block.css      | 3 ---
 core/themes/olivero/css/components/powered-by-block.pcss.css | 5 +----
 core/themes/olivero/images/drupal.svg                        | 3 +++
 .../templates/block/block--system-powered-by-block.html.twig | 4 +---
 4 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 core/themes/olivero/images/drupal.svg

diff --git a/core/themes/olivero/css/components/powered-by-block.css b/core/themes/olivero/css/components/powered-by-block.css
index db579eb7504..76caa3ce05f 100644
--- a/core/themes/olivero/css/components/powered-by-block.css
+++ b/core/themes/olivero/css/components/powered-by-block.css
@@ -35,9 +35,6 @@
   width: 0.875rem; /* 14 */
   height: 1.1875rem; /* 19 */
   vertical-align: top;
-}
-
-.block-system-powered-by-block svg path {
   fill: currentColor;
 }
 
diff --git a/core/themes/olivero/css/components/powered-by-block.pcss.css b/core/themes/olivero/css/components/powered-by-block.pcss.css
index 879ec4e07a6..cda5dc7ce46 100644
--- a/core/themes/olivero/css/components/powered-by-block.pcss.css
+++ b/core/themes/olivero/css/components/powered-by-block.pcss.css
@@ -29,10 +29,7 @@
     width: 0.875rem; /* 14 */
     height: 1.1875rem; /* 19 */
     vertical-align: top;
-
-    & path {
-      fill: currentColor;
-    }
+    fill: currentColor;
   }
 }
 
diff --git a/core/themes/olivero/images/drupal.svg b/core/themes/olivero/images/drupal.svg
new file mode 100644
index 00000000000..52e681d1a58
--- /dev/null
+++ b/core/themes/olivero/images/drupal.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="19" viewBox="0 0 42.15 55.08" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.75 11.73C25.87 7.86 22.18 4.16 21.08 0 20 4.16 16.28 7.86 12.4 11.73 6.59 17.54 0 24.12 0 34a21.08 21.08 0 1042.15 0c0-9.88-6.59-16.46-12.4-22.27zM10.84 35.92a14.13 14.13 0 00-1.65 2.62.54.54 0 01-.36.3h-.18c-.47 0-1-.92-1-.92-.14-.22-.27-.45-.4-.69l-.09-.19C5.94 34.25 7 30.28 7 30.28a17.42 17.42 0 012.52-5.41 31.53 31.53 0 012.28-3l1 1 4.72 4.82a.54.54 0 010 .72l-4.93 5.47zm10.48 13.81a7.29 7.29 0 01-5.4-12.14c1.54-1.83 3.42-3.63 5.46-6 2.42 2.58 4 4.35 5.55 6.29a3.08 3.08 0 01.32.48 7.15 7.15 0 011.3 4.12 7.23 7.23 0 01-7.23 7.25zM35 38.14a.84.84 0 01-.67.58h-.14a1.22 1.22 0 01-.68-.55 37.77 37.77 0 00-4.28-5.31l-1.93-2-6.41-6.65a54 54 0 01-3.84-3.94 1.3 1.3 0 00-.1-.15 3.84 3.84 0 01-.51-1v-.19a3.4 3.4 0 011-3c1.24-1.24 2.49-2.49 3.67-3.79 1.3 1.44 2.69 2.82 4.06 4.19a57.6 57.6 0 017.55 8.58A16 16 0 0135.65 34a14.55 14.55 0 01-.65 4.14z"/>
+</svg>
diff --git a/core/themes/olivero/templates/block/block--system-powered-by-block.html.twig b/core/themes/olivero/templates/block/block--system-powered-by-block.html.twig
index 3b3f02d422e..c16934107b8 100644
--- a/core/themes/olivero/templates/block/block--system-powered-by-block.html.twig
+++ b/core/themes/olivero/templates/block/block--system-powered-by-block.html.twig
@@ -15,9 +15,7 @@
     {% trans %}Powered by{% endtrans %}
     <a href="https://www.drupal.org">{% trans %}Drupal{% endtrans %}</a>
     <span class="drupal-logo" aria-label="{{ 'Drupal Logo'|t }}">
-      <svg width="14" height="19" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42.15 55.08" fill="none" aria-label="{{ 'Drupal Logo'|t }}" role="img">
-        <path d="M29.75 11.73C25.87 7.86 22.18 4.16 21.08 0 20 4.16 16.28 7.86 12.4 11.73 6.59 17.54 0 24.12 0 34a21.08 21.08 0 1042.15 0c0-9.88-6.59-16.46-12.4-22.27zM10.84 35.92a14.13 14.13 0 00-1.65 2.62.54.54 0 01-.36.3h-.18c-.47 0-1-.92-1-.92-.14-.22-.27-.45-.4-.69l-.09-.19C5.94 34.25 7 30.28 7 30.28a17.42 17.42 0 012.52-5.41 31.53 31.53 0 012.28-3l1 1 4.72 4.82a.54.54 0 010 .72l-4.93 5.47zm10.48 13.81a7.29 7.29 0 01-5.4-12.14c1.54-1.83 3.42-3.63 5.46-6 2.42 2.58 4 4.35 5.55 6.29a3.08 3.08 0 01.32.48 7.15 7.15 0 011.3 4.12 7.23 7.23 0 01-7.23 7.25zM35 38.14a.84.84 0 01-.67.58h-.14a1.22 1.22 0 01-.68-.55 37.77 37.77 0 00-4.28-5.31l-1.93-2-6.41-6.65a54 54 0 01-3.84-3.94 1.3 1.3 0 00-.1-.15 3.84 3.84 0 01-.51-1v-.19a3.4 3.4 0 011-3c1.24-1.24 2.49-2.49 3.67-3.79 1.3 1.44 2.69 2.82 4.06 4.19a57.6 57.6 0 017.55 8.58A16 16 0 0135.65 34a14.55 14.55 0 01-.65 4.14z"/>
-      </svg>
+      {% include "@olivero/../images/drupal.svg" %}
     </span>
   </span>
 {% endblock %}