From: ArthurHoaro Date: Thu, 9 Mar 2017 19:10:14 +0000 (+0100) Subject: Merge pull request #797 from ArthurHoaro/hotfix/font-git X-Git-Tag: v0.9.0~42 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=844021ab4c0d3dd6c26704648a736fa53244c914;hp=16a2ef6b5a28da9e3252d95c3217bb9b8c1e3ae4;p=github%2Fshaarli%2FShaarli.git Merge pull request #797 from ArthurHoaro/hotfix/font-git Prevent git from messing with font files --- diff --git a/.gitattributes b/.gitattributes index 059fbb18..82f37602 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,10 +10,16 @@ *.php text diff=php Dockerfile text -# Do not alter images nor minified scripts +# Do not alter images nor minified scripts nor fonts *.ico binary *.jpg binary *.png binary +*.svg binary +*.otf binary +*.eot binary +*.woff binary +*.woff2 binary +*.ttf binary *.min.css binary *.min.js binary diff --git a/tpl/default/fonts/Fira-Sans-regular.woff b/tpl/default/fonts/Fira-Sans-regular.woff index 3ba3c8ab..014ac317 100644 Binary files a/tpl/default/fonts/Fira-Sans-regular.woff and b/tpl/default/fonts/Fira-Sans-regular.woff differ diff --git a/tpl/default/fonts/Fira-Sans-regular.woff2 b/tpl/default/fonts/Fira-Sans-regular.woff2 index c7ada1ba..bf3ad9a4 100644 Binary files a/tpl/default/fonts/Fira-Sans-regular.woff2 and b/tpl/default/fonts/Fira-Sans-regular.woff2 differ diff --git a/tpl/default/fonts/FontAwesome.otf b/tpl/default/fonts/FontAwesome.otf index e8778ff2..401ec0f3 100644 Binary files a/tpl/default/fonts/FontAwesome.otf and b/tpl/default/fonts/FontAwesome.otf differ diff --git a/tpl/default/fonts/fontawesome-webfont.eot b/tpl/default/fonts/fontawesome-webfont.eot index 87e5c260..e9f60ca9 100644 Binary files a/tpl/default/fonts/fontawesome-webfont.eot and b/tpl/default/fonts/fontawesome-webfont.eot differ diff --git a/tpl/default/fonts/fontawesome-webfont.svg b/tpl/default/fonts/fontawesome-webfont.svg index d05688e9..855c845e 100644 --- a/tpl/default/fonts/fontawesome-webfont.svg +++ b/tpl/default/fonts/fontawesome-webfont.svg @@ -1,655 +1,2671 @@ - - + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tpl/default/fonts/fontawesome-webfont.ttf b/tpl/default/fonts/fontawesome-webfont.ttf index 84864859..35acda2f 100644 Binary files a/tpl/default/fonts/fontawesome-webfont.ttf and b/tpl/default/fonts/fontawesome-webfont.ttf differ diff --git a/tpl/default/fonts/fontawesome-webfont.woff b/tpl/default/fonts/fontawesome-webfont.woff index dc35ce3c..400014a4 100644 Binary files a/tpl/default/fonts/fontawesome-webfont.woff and b/tpl/default/fonts/fontawesome-webfont.woff differ diff --git a/tpl/default/fonts/fontawesome-webfont.woff2 b/tpl/default/fonts/fontawesome-webfont.woff2 index a5fc2314..4d13fc60 100644 Binary files a/tpl/default/fonts/fontawesome-webfont.woff2 and b/tpl/default/fonts/fontawesome-webfont.woff2 differ