Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1305 from ArthurHoaro/feature/forkawsome

Browse source 
Switch from FontAwesome v4.x to ForkAwesome
This commit is contained in:
ArthurHoaro 2019-05-25 15:38:15 +02:00 committed by GitHub
commit 5f8f6134bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/default/img/icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 530 B

4
assets/default/scss/shaarli.scss
View file

@ -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/pure.css';
@import '~purecss/build/grids-responsive.css'; @import '~purecss/build/grids-responsive.css';
@import '~pure-extras/css/pure-extras.css'; @import '~pure-extras/css/pure-extras.css';

2
package.json
View file

@ -6,7 +6,7 @@
"dependencies": { "dependencies": {
"awesomplete": "^1.1.2", "awesomplete": "^1.1.2",
"blazy": "^1.8.2", "blazy": "^1.8.2",
"font-awesome": "^4.7.0", "fork-awesome": "^1.1.7",
"pure-extras": "^1.0.0", "pure-extras": "^1.0.0",
"purecss": "^1.0.0" "purecss": "^1.0.0"
}, },

1
tpl/default/page.footer.html
View file

@ -3,6 +3,7 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-2-24"></div> <div class="pure-u-2-24"></div>
<footer id="footer" class="pure-u-20-24 footer-container" role="contentinfo"> <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> <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong>
{if="$is_logged_in===true"} {if="$is_logged_in===true"}
{$version} {$version}

4
tpl/default/page.header.html
View file

@ -2,7 +2,7 @@
<div class="pure-u-lg-0 pure-u-1"> <div class="pure-u-lg-0 pure-u-1">
<div class="pure-menu"> <div class="pure-menu">
<a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile"> <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} {$shaarlititle}
</a> </a>
<a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></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"> <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"> <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"> <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} {$shaarlititle}
</a> </a>
</li> </li>

10
yarn.lock
View file

@ -2433,11 +2433,6 @@ flatten@^1.0.2:
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I= 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: for-in@^0.1.3:
version "0.1.8" version "0.1.8"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" 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" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= 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: form-data@~2.3.2:
version "2.3.3" version "2.3.3"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"