From: ArthurHoaro Date: Sat, 25 May 2019 13:38:49 +0000 (+0200) Subject: Merge pull request #1301 from ArthurHoaro/template/print-css X-Git-Tag: v0.11.0~15 X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=8ed59f107e5b373f3517b3c33e817e70375829c8;hp=374f89e721047bb983d3c3270e73b2ffe8d9d079 Merge pull request #1301 from ArthurHoaro/template/print-css Add print CSS rules to the default template --- diff --git a/assets/default/img/icon.png b/assets/default/img/icon.png deleted file mode 100644 index 474edec3..00000000 Binary files a/assets/default/img/icon.png and /dev/null differ diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss index 90000750..9e5464a0 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 3dd1e0fc..f3d9b51e 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" }, @@ -21,7 +21,7 @@ "eslint-plugin-import": "^2.8.0", "extract-text-webpack-plugin": "^3.0.2", "file-loader": "^1.1.6", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "sass-lint": "^1.12.1", "sass-loader": "^6.0.6", "style-loader": "^0.19.1", diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 4e50495a..68947f92 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html @@ -17,7 +17,7 @@ class={if="$untaggedonly"}"filter-on"{else}"filter-off"{/if} > 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 @@