From 4a9894966d454becb4b7ca847ac02e731c2b2305 Mon Sep 17 00:00:00 2001
From: Dean Attali <daattali@gmail.com>
Date: Fri, 14 Jun 2024 05:40:17 +0000
Subject: [PATCH 1/2] upgrade fontawesoem to 6.5.2; fixes 1330

---
 CHANGELOG.md       | 1 +
 _layouts/base.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca56a4255209..95dff15f7af3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Pagination buttons: use nicer arrows, and don't show text on small screens (#1221)
 - Updated Yelp URL format - if you previously used the `yelp` social network config parameter, you might need to update the config value (#1259)
 - Added `title-on-all-pages` config setting, that adds the website title to all page titles (#1272)
+- Upgraded font-awesome to 6.5.2 (#1330)
 
 ## v6.0.1 (2023-06-08)
 
diff --git a/_layouts/base.html b/_layouts/base.html
index 6d5503395f60..df2c16fd7d8a 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -5,7 +5,7 @@
 common-ext-css:
   - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
     sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
-  - "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css"
+  - "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css"
   - "https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic"
   - "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
 common-ext-js:

From a5b9bedcc3915b3e2b32e5ec675978fe28a38a5d Mon Sep 17 00:00:00 2001
From: Dean Attali <daattali@gmail.com>
Date: Fri, 14 Jun 2024 05:45:40 +0000
Subject: [PATCH 2/2] change twitter icon to X; fixes #1193

---
 CHANGELOG.md                         | 1 +
 _includes/social-networks-links.html | 6 +++---
 _includes/social-share.html          | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95dff15f7af3..13900d08b2ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Pagination buttons: use nicer arrows, and don't show text on small screens (#1221)
 - Updated Yelp URL format - if you previously used the `yelp` social network config parameter, you might need to update the config value (#1259)
 - Added `title-on-all-pages` config setting, that adds the website title to all page titles (#1272)
+- Change Twitter icon to X (#1193)
 - Upgraded font-awesome to 6.5.2 (#1330)
 
 ## v6.0.1 (2023-06-08)
diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html
index c80e232460ca..141b27c2297f 100644
--- a/_includes/social-networks-links.html
+++ b/_includes/social-networks-links.html
@@ -101,12 +101,12 @@
 
   {%- if network[0] == "twitter" -%}
   <li class="list-inline-item">
-    <a href="https://twitter.com/{{ network[1] }}" title="Twitter">
+    <a href="https://twitter.com/{{ network[1] }}" title="X (Twitter)">
       <span class="fa-stack fa-lg" aria-hidden="true">
         <i class="fas fa-circle fa-stack-2x"></i>
-        <i class="fab fa-twitter fa-stack-1x fa-inverse"></i>
+        <i class="fab fa-x-twitter fa-stack-1x fa-inverse"></i>
       </span>
-      <span class="sr-only">Twitter</span>
+      <span class="sr-only">X (Twitter)</span>
    </a>
   </li>
   {%- endif -%}
diff --git a/_includes/social-share.html b/_includes/social-share.html
index 4a7ca01e5b7c..b2e07e4b64bf 100644
--- a/_includes/social-share.html
+++ b/_includes/social-share.html
@@ -12,9 +12,9 @@
 
   {% if site.share-links-active.twitter %}
     <a href="https://twitter.com/intent/tweet?text={{ page.title | strip_html | url_encode }}&url={{ page.url | absolute_url | url_encode }}"
-      class="btn btn-social-icon btn-twitter" title="Share on Twitter">
-      <span class="fab fa-fw fa-twitter" aria-hidden="true"></span>
-      <span class="sr-only">Twitter</span>
+      class="btn btn-social-icon btn-twitter" title="Share on X (Twitter)">
+      <span class="fab fa-fw fa-x-twitter" aria-hidden="true"></span>
+      <span class="sr-only">X (Twitter)</span>
     </a>
   {% endif %}