From 6acf93c0d272d7dc923fee2edf0556451d05d351 Mon Sep 17 00:00:00 2001
From: Sanne de Vries <65487235+sanne-san@users.noreply.github.com>
Date: Mon, 2 Oct 2023 14:48:34 +0200
Subject: [PATCH] Updated Twitter wording and logos (#18419)

No ref
---
 ghost/admin/app/components/gh-post-settings-menu.hbs | 4 ++--
 ghost/admin/app/components/tags/tag-form.hbs         | 2 +-
 ghost/admin/app/styles/layouts/post-preview.css      | 7 +++++++
 ghost/admin/public/assets/icons/social-x.svg         | 8 +++-----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ghost/admin/app/components/gh-post-settings-menu.hbs b/ghost/admin/app/components/gh-post-settings-menu.hbs
index d692595e23..b9a141ec2f 100644
--- a/ghost/admin/app/components/gh-post-settings-menu.hbs
+++ b/ghost/admin/app/components/gh-post-settings-menu.hbs
@@ -199,7 +199,7 @@
                         </li>
                         <li class="nav-list-item">
                             <button type="button"  {{action "showSubview" "twitter-data"}} data-test-button="twitter-data">
-                                <span>{{svg-jar "x-logo"}} X (formerly Twitter) card</span>
+                                <span>{{svg-jar "x-logo"}} X card</span>
                             </button>
                             {{svg-jar "arrow-right" class="arrow-right"}}
                         </li>
@@ -523,7 +523,7 @@
                                         </div>
                                     </div>
                                     <div class="gh-shortcut">
-                                        <div>Twitter</div>
+                                        <div>X (formerly Twitter)</div>
                                         <div class="gh-keys">
                                             <span class="gh-key mono">/twitter [url]</span>
                                         </div>
diff --git a/ghost/admin/app/components/tags/tag-form.hbs b/ghost/admin/app/components/tags/tag-form.hbs
index d85f4b6a7d..15c7be8a86 100644
--- a/ghost/admin/app/components/tags/tag-form.hbs
+++ b/ghost/admin/app/components/tags/tag-form.hbs
@@ -189,7 +189,7 @@
     <div class="gh-expandable-block">
         <div class="gh-expandable-header">
             <div>
-                <h4 class="gh-expandable-title">X (formerly Twitter) card</h4>
+                <h4 class="gh-expandable-title">X card</h4>
                 <p class="gh-expandable-description">Customized structured data for X.</p>
             </div>
             <button type="button" class="gh-btn gh-btn-expand" {{on "click" (toggle "twitterMetadataOpen" this)}}><span>{{if this.twitterMetadataOpen "Close" "Expand"}}</span></button>
diff --git a/ghost/admin/app/styles/layouts/post-preview.css b/ghost/admin/app/styles/layouts/post-preview.css
index 7e1ad08d9a..c73d1c6cc0 100644
--- a/ghost/admin/app/styles/layouts/post-preview.css
+++ b/ghost/admin/app/styles/layouts/post-preview.css
@@ -436,6 +436,13 @@
     margin-right: 8px;
 }
 
+.gh-twitter-container .social-icon,
+.gh-social-twitter-container .social-icon {
+    width: 34px;
+    height: 34px;
+    margin-right: 12px;
+}
+
 .gh-social-og-container {
     width: 476px;
     margin-bottom: 2.4rem;
diff --git a/ghost/admin/public/assets/icons/social-x.svg b/ghost/admin/public/assets/icons/social-x.svg
index 134fcfd3e5..6fffdb2321 100644
--- a/ghost/admin/public/assets/icons/social-x.svg
+++ b/ghost/admin/public/assets/icons/social-x.svg
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40">
-    <title>social-x</title>
-    <circle cx="20" cy="20" r="20" fill="#000"/>
-    <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M24.518 29 11 11h4.482L29 29h-4.482Zm3.846-18-7.126 7.667M11.636 29l7.12-7.661"/>
-</svg>
\ No newline at end of file
+    <svg viewBox="0 0 24 24" aria-hidden="true">
+        <path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"></path>
+    </svg>
\ No newline at end of file