diff options
-rw-r--r-- | assets/default/img/icon.png | bin | 530 -> 0 bytes | |||
-rw-r--r-- | assets/default/scss/shaarli.scss | 4 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | tpl/default/page.footer.html | 1 | ||||
-rw-r--r-- | tpl/default/page.header.html | 4 | ||||
-rw-r--r-- | yarn.lock | 10 |
6 files changed, 11 insertions, 10 deletions
diff --git a/assets/default/img/icon.png b/assets/default/img/icon.png deleted file mode 100644 index 474edec3..00000000 --- a/assets/default/img/icon.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss index a529f01c..95e2ba93 100644 --- a/assets/default/scss/shaarli.scss +++ b/assets/default/scss/shaarli.scss | |||
@@ -1,6 +1,6 @@ | |||
1 | $fa-font-path: '~font-awesome/fonts'; | 1 | $fa-font-path: '~fork-awesome/fonts'; |
2 | 2 | ||
3 | @import '~font-awesome/scss/font-awesome'; | 3 | @import '~fork-awesome/scss/fork-awesome'; |
4 | @import '~purecss/build/pure.css'; | 4 | @import '~purecss/build/pure.css'; |
5 | @import '~purecss/build/grids-responsive.css'; | 5 | @import '~purecss/build/grids-responsive.css'; |
6 | @import '~pure-extras/css/pure-extras.css'; | 6 | @import '~pure-extras/css/pure-extras.css'; |
diff --git a/package.json b/package.json index 3c675146..f3d9b51e 100644 --- a/package.json +++ b/package.json | |||
@@ -6,7 +6,7 @@ | |||
6 | "dependencies": { | 6 | "dependencies": { |
7 | "awesomplete": "^1.1.2", | 7 | "awesomplete": "^1.1.2", |
8 | "blazy": "^1.8.2", | 8 | "blazy": "^1.8.2", |
9 | "font-awesome": "^4.7.0", | 9 | "fork-awesome": "^1.1.7", |
10 | "pure-extras": "^1.0.0", | 10 | "pure-extras": "^1.0.0", |
11 | "purecss": "^1.0.0" | 11 | "purecss": "^1.0.0" |
12 | }, | 12 | }, |
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index f7ae2b84..ce858e8c 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html | |||
@@ -3,6 +3,7 @@ | |||
3 | <div class="pure-g"> | 3 | <div class="pure-g"> |
4 | <div class="pure-u-2-24"></div> | 4 | <div class="pure-u-2-24"></div> |
5 | <footer id="footer" class="pure-u-20-24 footer-container" role="contentinfo"> | 5 | <footer id="footer" class="pure-u-20-24 footer-container" role="contentinfo"> |
6 | <i class="fa fa-shaarli" aria-hidden="true"></i> | ||
6 | <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong> | 7 | <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong> |
7 | {if="$is_logged_in===true"} | 8 | {if="$is_logged_in===true"} |
8 | {$version} | 9 | {$version} |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 2832ebbb..9ce9873c 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -2,7 +2,7 @@ | |||
2 | <div class="pure-u-lg-0 pure-u-1"> | 2 | <div class="pure-u-lg-0 pure-u-1"> |
3 | <div class="pure-menu"> | 3 | <div class="pure-menu"> |
4 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile"> | 4 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile"> |
5 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" /> | 5 | <i class="fa fa-shaarli" aria-hidden="true"></i> |
6 | {$shaarlititle} | 6 | {$shaarlititle} |
7 | </a> | 7 | </a> |
8 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> | 8 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> |
@@ -13,7 +13,7 @@ | |||
13 | <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1"> | 13 | <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1"> |
14 | <li class="pure-menu-item pure-u-0 pure-u-lg-visible"> | 14 | <li class="pure-menu-item pure-u-0 pure-u-lg-visible"> |
15 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-desktop"> | 15 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-desktop"> |
16 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" /> | 16 | <i class="fa fa-shaarli" aria-hidden="true"></i> |
17 | {$shaarlititle} | 17 | {$shaarlititle} |
18 | </a> | 18 | </a> |
19 | </li> | 19 | </li> |
@@ -2433,11 +2433,6 @@ flatten@^1.0.2: | |||
2433 | resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" | 2433 | resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" |
2434 | integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I= | 2434 | integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I= |
2435 | 2435 | ||
2436 | font-awesome@^4.7.0: | ||
2437 | version "4.7.0" | ||
2438 | resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" | ||
2439 | integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM= | ||
2440 | |||
2441 | for-in@^0.1.3: | 2436 | for-in@^0.1.3: |
2442 | version "0.1.8" | 2437 | version "0.1.8" |
2443 | resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" | 2438 | resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" |
@@ -2460,6 +2455,11 @@ forever-agent@~0.6.1: | |||
2460 | resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" | 2455 | resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" |
2461 | integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= | 2456 | integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= |
2462 | 2457 | ||
2458 | fork-awesome@^1.1.7: | ||
2459 | version "1.1.7" | ||
2460 | resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz#1427da1cac3d1713046ee88427e5fcecb9501d21" | ||
2461 | integrity sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g== | ||
2462 | |||
2463 | form-data@~2.3.2: | 2463 | form-data@~2.3.2: |
2464 | version "2.3.3" | 2464 | version "2.3.3" |
2465 | resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" | 2465 | resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" |