From 0f7f7eaa7f72078b12968d3e90db28b4ffbb045d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n?= <41774881+xentenza@users.noreply.github.com>
Date: Tue, 8 Aug 2023 15:10:28 +0200
Subject: [PATCH 1/2] New X icon

Changed Twitter logo to X
---
 assets/components/atoms/social-icon/social-icon-group.twig    | 2 +-
 .../components/atoms/social-icon/social-icon-link-group.twig  | 2 +-
 assets/components/atoms/social-icon/social-icon-link.twig     | 4 ++--
 .../social-icon/social-icon-single-link-with-details.twig     | 4 ++--
 .../components/atoms/social-icon/social-icon-single-link.twig | 4 ++--
 assets/components/atoms/social-icon/social-icon-single.twig   | 4 ++--
 assets/components/atoms/social-icon/social-icon.scss          | 4 ++--
 assets/components/atoms/social-icon/social-icon.twig          | 4 ++--
 assets/components/atoms/social-icon/social-icon.yml           | 2 +-
 assets/components/molecules/social-feed/social-feed.twig      | 4 ++--
 assets/components/molecules/social/social.twig                | 4 ++--
 assets/components/pages/news-detail/news-detail.twig          | 4 ++--
 assets/config/data.json                                       | 3 ++-
 assets/config/social-color.scss                               | 1 +
 assets/icons/x.svg                                            | 1 +
 15 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 assets/icons/x.svg

diff --git a/assets/components/atoms/social-icon/social-icon-group.twig b/assets/components/atoms/social-icon/social-icon-group.twig
index d6f2e6866..5e22c85a7 100644
--- a/assets/components/atoms/social-icon/social-icon-group.twig
+++ b/assets/components/atoms/social-icon/social-icon-group.twig
@@ -7,7 +7,7 @@
     {% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'Facebook', icon: 'icon-facebook', round: round, discrete: discrete, negative: negative } %}
   </li>
   <li>
-    {% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'Twitter', icon: 'icon-twitter', round: round, discrete: discrete, negative: negative } %}
+    {% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'X', icon: 'icon-x', round: round, discrete: discrete, negative: negative } %}
   </li>
   <li>
     {% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'Instagram', icon: 'icon-instagram', round: round, discrete: discrete, negative: negative } %}
diff --git a/assets/components/atoms/social-icon/social-icon-link-group.twig b/assets/components/atoms/social-icon/social-icon-link-group.twig
index a7e7eaca0..2d89d434c 100644
--- a/assets/components/atoms/social-icon/social-icon-link-group.twig
+++ b/assets/components/atoms/social-icon/social-icon-link-group.twig
@@ -7,7 +7,7 @@
     {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Facebook', icon: 'icon-facebook', round: round, discrete: discrete, negative: negative, url: 'https://www.facebook.com/epflcampus' } %}
   </li>
   <li>
-    {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Twitter', icon: 'icon-twitter', round: round, discrete: discrete, negative: negative, url: 'https://twitter.com/epfl_en' } %}
+    {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on X', icon: 'icon-x', round: round, discrete: discrete, negative: negative, url: 'https://x.com/epfl_en' } %}
   </li>
   <li>
     {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Instagram', icon: 'icon-instagram', round: round, discrete: discrete, negative: negative, url: 'http://instagram.com/epflcampus' } %}
diff --git a/assets/components/atoms/social-icon/social-icon-link.twig b/assets/components/atoms/social-icon/social-icon-link.twig
index 6829e6d8b..50ca7ee06 100644
--- a/assets/components/atoms/social-icon/social-icon-link.twig
+++ b/assets/components/atoms/social-icon/social-icon-link.twig
@@ -1,5 +1,5 @@
-{% set pretty_name = pretty_name ?: 'Twitter' %}
-{% set icon = icon ?: 'icon-twitter' %}
+{% set pretty_name = pretty_name ?: 'X' %}
+{% set icon = icon ?: 'icon-x' %}
 {% set round = round ? ' social-icon-round' : '' %}
 {% set discrete = discrete ? ' social-icon-discrete' : '' %}
 {% set negative = negative ? ' social-icon-negative' : '' %}
diff --git a/assets/components/atoms/social-icon/social-icon-single-link-with-details.twig b/assets/components/atoms/social-icon/social-icon-single-link-with-details.twig
index 351ffc161..30978dcad 100644
--- a/assets/components/atoms/social-icon/social-icon-single-link-with-details.twig
+++ b/assets/components/atoms/social-icon/social-icon-single-link-with-details.twig
@@ -1,6 +1,6 @@
-{% set pretty_name = pretty_name ?: 'Twitter' %}
+{% set pretty_name = pretty_name ?: 'X' %}
 {% set user_id = user_id ?: 'firstname.name' %}
-{% set icon = icon ?: 'icon-twitter' %}
+{% set icon = icon ?: 'icon-x' %}
 {% set round = round ? ' social-icon-round' : '' %}
 {% set discrete = discrete ? ' social-icon-discrete' : '' %}
 {% set negative = negative ? ' social-icon-negative' : '' %}
diff --git a/assets/components/atoms/social-icon/social-icon-single-link.twig b/assets/components/atoms/social-icon/social-icon-single-link.twig
index bceb464ee..ab3a39384 100644
--- a/assets/components/atoms/social-icon/social-icon-single-link.twig
+++ b/assets/components/atoms/social-icon/social-icon-single-link.twig
@@ -1,5 +1,5 @@
-{% set pretty_name = pretty_name ?: 'Follow us on Twitter' %}
-{% set icon = icon ?: 'icon-twitter' %}
+{% set pretty_name = pretty_name ?: 'Follow us on X' %}
+{% set icon = icon ?: 'icon-x' %}
 {% set round = round ? ' social-icon-round' : '' %}
 {% set discrete = discrete ? ' social-icon-discrete' : '' %}
 {% set negative = negative ? ' social-icon-negative' : '' %}
diff --git a/assets/components/atoms/social-icon/social-icon-single.twig b/assets/components/atoms/social-icon/social-icon-single.twig
index 31bac2511..f361fd429 100644
--- a/assets/components/atoms/social-icon/social-icon-single.twig
+++ b/assets/components/atoms/social-icon/social-icon-single.twig
@@ -1,5 +1,5 @@
-{% set pretty_name = pretty_name ?: 'Twitter' %}
-{% set icon = icon ?: 'icon-twitter' %}
+{% set pretty_name = pretty_name ?: 'X' %}
+{% set icon = icon ?: 'icon-x' %}
 {% set round = round ? ' social-icon-round' : '' %}
 {% set discrete = discrete ? ' social-icon-discrete' : '' %}
 {% set negative = negative ? ' social-icon-negative' : '' %}
diff --git a/assets/components/atoms/social-icon/social-icon.scss b/assets/components/atoms/social-icon/social-icon.scss
index 6ac563d18..8d9ecd93f 100644
--- a/assets/components/atoms/social-icon/social-icon.scss
+++ b/assets/components/atoms/social-icon/social-icon.scss
@@ -56,8 +56,8 @@ a.social-icon {
   background-color: $facebook;
 }
 
-.social-icon-twitter {
-  background-color: $twitter;
+.social-icon-x {
+  background-color: $x;
 }
 
 .social-icon-whatsapp {
diff --git a/assets/components/atoms/social-icon/social-icon.twig b/assets/components/atoms/social-icon/social-icon.twig
index 31bac2511..f361fd429 100644
--- a/assets/components/atoms/social-icon/social-icon.twig
+++ b/assets/components/atoms/social-icon/social-icon.twig
@@ -1,5 +1,5 @@
-{% set pretty_name = pretty_name ?: 'Twitter' %}
-{% set icon = icon ?: 'icon-twitter' %}
+{% set pretty_name = pretty_name ?: 'X' %}
+{% set icon = icon ?: 'icon-x' %}
 {% set round = round ? ' social-icon-round' : '' %}
 {% set discrete = discrete ? ' social-icon-discrete' : '' %}
 {% set negative = negative ? ' social-icon-negative' : '' %}
diff --git a/assets/components/atoms/social-icon/social-icon.yml b/assets/components/atoms/social-icon/social-icon.yml
index 77060db7f..61fb03227 100644
--- a/assets/components/atoms/social-icon/social-icon.yml
+++ b/assets/components/atoms/social-icon/social-icon.yml
@@ -24,7 +24,7 @@ notes: |
   Icons to accomodate social boxes. The available social networks are:
   * `facebook`
   * `instagram`
-  * `twitter`
+  * `x`
   * `e-mail`
   * `whatsapp`
   * `linkedin`
diff --git a/assets/components/molecules/social-feed/social-feed.twig b/assets/components/molecules/social-feed/social-feed.twig
index 263ded406..867b9e0c7 100644
--- a/assets/components/molecules/social-feed/social-feed.twig
+++ b/assets/components/molecules/social-feed/social-feed.twig
@@ -1,5 +1,5 @@
 <div class="social-feed">
-  {% include '@atoms/social-icon/social-icon.twig' with { icon: 'icon-twitter', round: true } %}
+  {% include '@atoms/social-icon/social-icon.twig' with { icon: 'icon-x', round: true } %}
 
   <div class="social-feed-content">
     <div>
@@ -11,7 +11,7 @@
       <p>What's your fave spot for sunset on campus? 😎</p>
     </div>
     <div>
-      <a class="btn btn-secondary mt-4">Nous rejoindre sur Twitter</a>
+      <a class="btn btn-secondary mt-4">Nous rejoindre sur X</a>
     </div>
   </div>
 </div>
diff --git a/assets/components/molecules/social/social.twig b/assets/components/molecules/social/social.twig
index e4ad1f42f..717a1c5c5 100644
--- a/assets/components/molecules/social/social.twig
+++ b/assets/components/molecules/social/social.twig
@@ -18,8 +18,8 @@
           </li>
           <li>
             {% include '@atoms/social-icon/social-icon-single-link.twig' with {
-              pretty_name: 'Share on Twitter',
-              icon: 'icon-twitter',
+              pretty_name: 'Share on X',
+              icon: 'icon-x',
               round: round,
               discrete: true,
               url: '#'
diff --git a/assets/components/pages/news-detail/news-detail.twig b/assets/components/pages/news-detail/news-detail.twig
index 631253fc5..d9d1cb99f 100644
--- a/assets/components/pages/news-detail/news-detail.twig
+++ b/assets/components/pages/news-detail/news-detail.twig
@@ -134,8 +134,8 @@
             <a href="#" class="social-icon social-icon-discrete social-icon-facebook">
               <svg class="icon"><use xlink:href="#icon-facebook"></use></svg>
             </a>
-            <a href="#" class="social-icon social-icon-discrete social-icon-twitter">
-              <svg class="icon"><use xlink:href="#icon-twitter"></use></svg>
+            <a href="#" class="social-icon social-icon-discrete social-icon-x">
+              <svg class="icon"><use xlink:href="#icon-x"></use></svg>
             </a>
             <a href="#" class="social-icon social-icon-discrete social-icon-instagram">
               <svg class="icon"><use xlink:href="#icon-instagram"></use></svg>
diff --git a/assets/config/data.json b/assets/config/data.json
index 5ba563432..d0d6af468 100644
--- a/assets/config/data.json
+++ b/assets/config/data.json
@@ -81,6 +81,7 @@
     "home",
     "info",
     "instagram",
+    "linkedin",
     "lock",
     "mail-plane",
     "triangle",
@@ -91,7 +92,7 @@
     "whatsapp",
     "planet",
     "youtube",
-    "linkedin"
+    "x"
   ],
   "feathericons": [
     "activity",
diff --git a/assets/config/social-color.scss b/assets/config/social-color.scss
index a5bc1e546..2ee280a73 100644
--- a/assets/config/social-color.scss
+++ b/assets/config/social-color.scss
@@ -76,3 +76,4 @@ $listlyblue: #52b1b3;
 $vine: #00b489;
 $steam: #171a21;
 $discord: #7289da;
+$x: #000000;
diff --git a/assets/icons/x.svg b/assets/icons/x.svg
new file mode 100644
index 000000000..252f8d875
--- /dev/null
+++ b/assets/icons/x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 1227"><path d="M714.163 519.284 1160.89 0h-105.86L667.137 450.887 357.328 0H0l468.492 681.821L0 1226.37h105.866l409.625-476.152 327.181 476.152H1200L714.137 519.284h.026ZM569.165 687.828l-47.468-67.894-377.686-540.24h162.604l304.797 435.991 47.468 67.894 396.2 566.721H892.476L569.165 687.854v-.026Z"></path></svg>
\ No newline at end of file

From fef1bfeabda7d4d21549c92efaf4a6a2d99f7e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n?= <41774881+xentenza@users.noreply.github.com>
Date: Tue, 22 Aug 2023 14:36:13 +0200
Subject: [PATCH 2/2] Update social-icon.scss

.social-icon-twitter class is back
---
 assets/components/atoms/social-icon/social-icon.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/components/atoms/social-icon/social-icon.scss b/assets/components/atoms/social-icon/social-icon.scss
index 8d9ecd93f..bd4ae9f2c 100644
--- a/assets/components/atoms/social-icon/social-icon.scss
+++ b/assets/components/atoms/social-icon/social-icon.scss
@@ -56,6 +56,10 @@ a.social-icon {
   background-color: $facebook;
 }
 
+.social-icon-twitter {
+  background-color: $twitter;
+}
+
 .social-icon-x {
   background-color: $x;
 }