From b2143ff480dab4c57320166bd1569ebcdde4731c Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 19 May 2019 11:57:23 +0200
Subject: [PATCH] Switch from FontAwesome v4.x to ForkAwesome

And use the Shaarli icon made by @xuv in the header and footer (default template).
---
 assets/default/img/icon.png      | Bin 530 -> 0 bytes
 assets/default/scss/shaarli.scss |   4 ++--
 package.json                     |   2 +-
 tpl/default/page.footer.html     |   1 +
 tpl/default/page.header.html     |   4 ++--
 yarn.lock                        |  10 +++++-----
 6 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 assets/default/img/icon.png

diff --git a/assets/default/img/icon.png b/assets/default/img/icon.png
deleted file mode 100644
index 474edec3097c5290e3a3b4d7ba580ca4977ad81b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 530
zcmV+t0`2{YP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002VoOIv0063u
zBQgL0010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Q<B?5fM5tIs*Uz03B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00DYQL_t(2&vlWxP6A;Rh0i~1
zt_%W#1W|D*j3LAjZA|0=3>uV%m$2|XjD_(L)Iy>#Xtc1furNU)7#kgf%&<w+2xcbg
zu>2M*V&S>f{c`Tj&AGrIg-u~2{#V3VEatNjM<-)C8|y}&g|!cE{4>wZh$)%MRD9&7
zf2kTcA~g+F6D=DsIkPd9*5=l)9_&CNRaM1LNyMrTc1`q*8>Y-tz{Mibde4D(q4Xf7
zzWDN<TJN9VYApMBPVawT0k@mOYsRsGQ2>a2k+5U#(lDZYUbtxi%Blh!YHJ$J&|*^8
zTN1Aq0B|mWmuXJq?Co>yIZ>tp&$*f)>Jc7fnh3QFi36DmeALs<!57b+0F<^26hQvW
z7w-tFZxWFBQ}5GVDtWRX-8V>wvT3RQT9#>}UQ1FvmuUwD99wiOA>I0NArl4TSYmB}
zu0Lw?6`BTGsVi0GZu@O_`3B%-O~ILUT0<28Nb`^8I#YWOR2p4Ktuiun<pltK0O_rt
UR%7PKDgXcg07*qoM6N<$f<#!+Y5)KL

diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss
index a529f01..95e2ba9 100644
--- a/assets/default/scss/shaarli.scss
+++ b/assets/default/scss/shaarli.scss
@@ -1,6 +1,6 @@
-$fa-font-path: '~font-awesome/fonts';
+$fa-font-path: '~fork-awesome/fonts';
 
-@import '~font-awesome/scss/font-awesome';
+@import '~fork-awesome/scss/fork-awesome';
 @import '~purecss/build/pure.css';
 @import '~purecss/build/grids-responsive.css';
 @import '~pure-extras/css/pure-extras.css';
diff --git a/package.json b/package.json
index 3c67514..f3d9b51 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "awesomplete": "^1.1.2",
     "blazy": "^1.8.2",
-    "font-awesome": "^4.7.0",
+    "fork-awesome": "^1.1.7",
     "pure-extras": "^1.0.0",
     "purecss": "^1.0.0"
   },
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index f7ae2b8..ce858e8 100644
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -3,6 +3,7 @@
 <div class="pure-g">
   <div class="pure-u-2-24"></div>
   <footer id="footer" class="pure-u-20-24 footer-container" role="contentinfo">
+    <i class="fa fa-shaarli" aria-hidden="true"></i>
     <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong>
     {if="$is_logged_in===true"}
       {$version}
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 2832ebb..9ce9873 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -2,7 +2,7 @@
   <div class="pure-u-lg-0 pure-u-1">
     <div class="pure-menu">
       <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile">
-        <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" />
+        <i class="fa fa-shaarli" aria-hidden="true"></i>
         {$shaarlititle}
       </a>
       <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a>
@@ -13,7 +13,7 @@
       <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1">
         <li class="pure-menu-item pure-u-0 pure-u-lg-visible">
           <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-desktop">
-            <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" />
+            <i class="fa fa-shaarli" aria-hidden="true"></i>
             {$shaarlititle}
           </a>
         </li>
diff --git a/yarn.lock b/yarn.lock
index 32f2c07..1aa94f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2433,11 +2433,6 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
   integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -2460,6 +2455,11 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+fork-awesome@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz#1427da1cac3d1713046ee88427e5fcecb9501d21"
+  integrity sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g==
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"