From 31a6b7c588f1b9bd5cf1949e0e4d2b3ae526309c Mon Sep 17 00:00:00 2001
From: Justine Doutreloux <justine.doutreloux@acsone.eu>
Date: Mon, 18 Mar 2024 15:44:44 +0100
Subject: [PATCH] [IMP] web: add new twitter logo

---
 .../web/static/src/fonts/twitter_x_only.woff   | Bin 0 -> 1176 bytes
 .../src/scss/fontawesome_overridden.scss       |  17 ++++++++++++++++-
 addons/web_editor/controllers/main.py          |   4 ++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 addons/web/static/src/fonts/twitter_x_only.woff

diff --git a/addons/web/static/src/fonts/twitter_x_only.woff b/addons/web/static/src/fonts/twitter_x_only.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ed88d97d5422e56c9bbb176d4619184e3a9c1724
GIT binary patch
literal 1176
zcmY*Ye@qis9RI$%_KM)31wzXPSW+evI%s<XW?&m*r4anVRv|;Dc%`KvqtE~fGeiLa
zaVBKWAZ1~MF~~-U88C+mOiqvj0>MEfaW+{|0&|Ko20F~3d)M*L-sN-O_xZff_xs+v
z_pUfuqX7iC@hsrZMJnw-&h`J_G@6us*jI{GKMvp6Mdk!`yasD&m<M6(gk2Dld>~u}
zfUaS_AA^a?I?$^(>C6Cx1oL<CSR8mfvg%J1NwLP|@|+MMb(XFW`*<H>?!v+005U80
zGb8q8W8Tcc)-W@XovAb6I%>?{!ibb9&(>yR5o;xw`(p%=SJ7~`sR(m|t0m;XF9T6-
zz8?FC!<f4|aS~EYx)MAuvS7XgLkfuypQkfr0+2Wt1!BJ|jI@4Y&Mz#&>yu-T3`5oY
z<z8z^qn<G^3}h^Z_Fa3hZn~iwrIlqYS^Tj`xUnpJc$BJk2qXil04UfkVW%PVh}(Nx
zIWfz4f20@bqBxbw7-IQyIC7UfjSFv$GdiJ;$p9oA8wJlo<_@_HfPWcko#VO;rjccD
zv+VCf7Awoz-P;CKiK;6Kg+kd`pkm9RVodnO!dHW4d&4Sy%t|^uU~LCu23NXbUh<}I
zJ+X^VX+S))y#?=(1reT>i$HA6&oIU^#+TAi!cMdzxmoH%@uibQW$Y&X$l(ZVop<{_
ziPA(;l8faRwk0Z*&4i{}=K%*_3i@yXe3tkf;(WN%B%JjdP%4lhfUqtE;W6C;9xSQ4
zD84PGn<Q`-x=2pub8@$ULjS~cBTlD9v?!Ps$wW29Mk7ky><}T^SrZ&ATElC0122Hr
zy=1`xSrkc&qi9l0hZ8a}3K_3E*C8Josw;1iKd)A|d7oA{EpFZ$8F`5O`};TNZa(qv
zd4NlmG*;D4<qXD3Ze>LrD(JGeUG1)~s5m$~`Tp{q^Pcwu$fb7iFQ)C4>e;mA>4ZPd
ztR8#m^7XCZJs#AhXZ7ow6Ckm_Ml3#a|Mkb%n&K&cn|-EG?D6-Xep2u9#elr3729`B
z1zKL9Bc<<dCo4>DieBAVwhg=8h!Hfdui1uvmXtizzY)+CTlLO<^XLWL*;hSfxe8;%
zM4nI|m##aP#eB4s95!|0CqI*QI@>FGK4;7tn)Gy`lrQhGXhR<NhdsGu(T<x9`TK%f
zBcpvjjf;C>{Gq+ptLJ#?YMte;je(Q1uNZ4A@?L{lTX$T0eIn`GD~;plqwh_$yqz<c
zKEAG*oMTU2+_TcNP?^(Vyx;pldY$%h`}Cos*Pjcb=Jr-OzmXo_#WRi<k|5ts<Rdj2
zm<&Tk_~dv|1YJbH;Z7cR<bd!$OKja=JIYW}yQ!V{5*eii1A{(SAf=2)g3Dz{;k;bJ
TZ?m`4xoA&__vYf<AlmpB{0e`+

literal 0
HcmV?d00001

diff --git a/addons/web/static/src/scss/fontawesome_overridden.scss b/addons/web/static/src/scss/fontawesome_overridden.scss
index a234dbc9f81f9..eecced44a1c0e 100644
--- a/addons/web/static/src/scss/fontawesome_overridden.scss
+++ b/addons/web/static/src/scss/fontawesome_overridden.scss
@@ -35,4 +35,19 @@
             transform: rotate(180deg);
         }
     }
-}
\ No newline at end of file
+}
+// This is a patch of the font awesome library to add the new "Twitter" X icon.
+@font-face {
+    font-family: 'FontAwesome-twitter-x-only';
+    src: url('../../src/fonts/twitter_x_only.woff');
+    font-weight: normal;
+    font-style: normal;
+    font-display: block;
+}
+.fa.fa-x-twitter {
+    font-family: 'FontAwesome-twitter-x-only' !important;
+
+    &:before {
+        content: '\e61b';
+    }
+}
diff --git a/addons/web_editor/controllers/main.py b/addons/web_editor/controllers/main.py
index 76d748377e648..ad544a9447071 100644
--- a/addons/web_editor/controllers/main.py
+++ b/addons/web_editor/controllers/main.py
@@ -37,6 +37,10 @@ def export_icon_to_png(self, icon, color='#000', size=100, alpha=255, font='/web
 
             :returns PNG image converted from given font
         """
+        # If the icon is the new twitter X logo, then use the corresponding custom font.
+        if icon.isdigit():
+            if int(icon) == 58907:
+                font = "/web/static/src/fonts/twitter_x_only.woff"
         # Make sure we have at least size=1
         size = max(1, min(size, 512))
         # Initialize font