diff --git a/.htaccess b/.htaccess index d1b8117218..0bf3f9d764 100644 --- a/.htaccess +++ b/.htaccess @@ -15,7 +15,7 @@ RewriteRule thumbnails/(.*)$ data/thumbnails/$1 [L] # rule for front controller RewriteCond %{QUERY_STRING} ^(.*)$ -RewriteRule !.(js|ico|gif|jpg|png|css|asc|txt|eot|woff|ttf|ttf|svg|xml)$ index.php?%1 +RewriteRule !.(js|ico|gif|jpg|png|css|asc|txt|svg|xml)$ index.php?%1 # rule for files RewriteRule !favicons/ - [C] @@ -129,6 +129,3 @@ RewriteRule (.*) public/$1 [L] - -# add font types for chromium/chrome -AddType application/font-woff woff diff --git a/NEWS.md b/NEWS.md index e0a57d4ab2..f35a8d56fa 100644 --- a/NEWS.md +++ b/NEWS.md @@ -31,6 +31,7 @@ ### Other changes - Removed broken instapaper scraping from Reddit spout ([#1033](https://github.com/SSilence/selfoss/pull/1033)) +- Open Sans font is no longer bundled and `use_system_font` option was removed. The typeface is still set as the default font family, so if you want to use it, install it to your devices. If you want to use a different typeface, add `body { font-family: 'Foo Face'; }` to your `custom.css`. ## 2.18 – 2018-03-05 diff --git a/_docs/website/index.html b/_docs/website/index.html index 7fdb4c76b4..544fb5b734 100644 --- a/_docs/website/index.html +++ b/_docs/website/index.html @@ -282,10 +282,6 @@

Configuration

anonymizer set here your anonymizer service url. e.g.: anonymizer=https://anonym.to/? - - use_system_font - set use_system_font=1 if you have problems with special characters. Then instead of Open Sans the font Arial will be used. - allow_public_update_access set allow_public_update_access=1 for allowing public access for /update (anybody can access and start the update job). diff --git a/defaults.ini b/defaults.ini index ea7a46a92b..5149bf4b07 100644 --- a/defaults.ini +++ b/defaults.ini @@ -28,7 +28,6 @@ auto_mark_as_read=0 auto_collapse=0 auto_stream_more=1 anonymizer= -use_system_font= share=gtfpde wallabag= wallabag_version=1 diff --git a/public/css/fonts.css b/public/css/fonts.css deleted file mode 100644 index 0e5a8b241c..0000000000 --- a/public/css/fonts.css +++ /dev/null @@ -1,67 +0,0 @@ - -@font-face { - font-family: 'OpenSans'; - src: url('../fonts/OpenSans-Light-webfont.eot'); - src: url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/OpenSans-Light-webfont.woff') format('woff'), - url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'), - url('../fonts/OpenSans-Light-webfont.svg#OpenSansLight') format('svg'); - font-weight: lighter; - font-style: normal; -} - -@font-face { - font-family: 'OpenSans'; - src: url('../fonts/OpenSans-Regular-webfont.eot'); - src: url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/OpenSans-Regular-webfont.woff') format('woff'), - url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'), - url('../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'OpenSans'; - src: url('../fonts/OpenSans-Italic-webfont.eot'); - src: url('../fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/OpenSans-Italic-webfont.woff') format('woff'), - url('../fonts/OpenSans-Italic-webfont.ttf') format('truetype'), - url('../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'OpenSans'; - src: url('../fonts/OpenSans-Semibold-webfont.eot'); - src: url('../fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/OpenSans-Semibold-webfont.woff') format('woff'), - url('../fonts/OpenSans-Semibold-webfont.ttf') format('truetype'), - url('../fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg'); - font-weight: 600; - font-style: normal; -} - -@font-face { - font-family: 'OpenSans'; - src: url('../fonts/OpenSans-Bold-webfont.eot'); - src: url('../fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/OpenSans-Bold-webfont.woff') format('woff'), - url('../fonts/OpenSans-Bold-webfont.ttf') format('truetype'), - url('../fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg'); - font-weight: bold; - font-style: normal; -} - -/*raus*/ -@font-face { - font-family: 'OpenSans'; - src: url('../fonts/OpenSans-BoldItalic-webfont.eot'); - src: url('../fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/OpenSans-BoldItalic-webfont.woff') format('woff'), - url('../fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'), - url('../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg'); - font-weight: bold; - font-style: italic; -} diff --git a/public/css/style.css b/public/css/style.css index 44ddf2c4e8..30669d0323 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -6,7 +6,7 @@ html { } body { - font: lighter 18px/27px 'OpenSans', Arial, sans-serif; + font: lighter 18px/27px 'Open Sans', Arial, sans-serif; color: black; background:url(images/bg.gif) repeat; height: 100%; @@ -925,7 +925,8 @@ body * { #opml h1 { background:url(images/logo.png) left center no-repeat; - font-family:'OpenSansSemibold', Arial, sans-serif; + font-family:'Open Sans', Arial, sans-serif; + font-weight: 600; /* semi-bold */ padding-top:10px; padding-left:40px; font-size:1.4em; diff --git a/public/fonts/OpenSans-Bold-webfont.eot b/public/fonts/OpenSans-Bold-webfont.eot deleted file mode 100644 index 5d4a1c4777..0000000000 Binary files a/public/fonts/OpenSans-Bold-webfont.eot and /dev/null differ diff --git a/public/fonts/OpenSans-Bold-webfont.svg b/public/fonts/OpenSans-Bold-webfont.svg deleted file mode 100644 index 1557f68074..0000000000 --- a/public/fonts/OpenSans-Bold-webfont.svg +++ /dev/null @@ -1,251 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Digitized data copyright 20102011 Google Corporation -Foundry : Ascender Corporation -Foundry URL : httpwwwascendercorpcom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/OpenSans-Bold-webfont.ttf b/public/fonts/OpenSans-Bold-webfont.ttf deleted file mode 100644 index 7ab5d85bfd..0000000000 Binary files a/public/fonts/OpenSans-Bold-webfont.ttf and /dev/null differ diff --git a/public/fonts/OpenSans-Bold-webfont.woff b/public/fonts/OpenSans-Bold-webfont.woff deleted file mode 100644 index 869a9ed8af..0000000000 Binary files a/public/fonts/OpenSans-Bold-webfont.woff and /dev/null differ diff --git a/public/fonts/OpenSans-BoldItalic-webfont.eot b/public/fonts/OpenSans-BoldItalic-webfont.eot deleted file mode 100644 index ad6518076e..0000000000 Binary files a/public/fonts/OpenSans-BoldItalic-webfont.eot and /dev/null differ diff --git a/public/fonts/OpenSans-BoldItalic-webfont.svg b/public/fonts/OpenSans-BoldItalic-webfont.svg deleted file mode 100644 index 24661f35f9..0000000000 --- a/public/fonts/OpenSans-BoldItalic-webfont.svg +++ /dev/null @@ -1,251 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Digitized data copyright 20102011 Google Corporation -Foundry : Ascender Corporation -Foundry URL : httpwwwascendercorpcom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/OpenSans-BoldItalic-webfont.ttf b/public/fonts/OpenSans-BoldItalic-webfont.ttf deleted file mode 100644 index 6a30fa9dd3..0000000000 Binary files a/public/fonts/OpenSans-BoldItalic-webfont.ttf and /dev/null differ diff --git a/public/fonts/OpenSans-BoldItalic-webfont.woff b/public/fonts/OpenSans-BoldItalic-webfont.woff deleted file mode 100644 index 46778a2179..0000000000 Binary files a/public/fonts/OpenSans-BoldItalic-webfont.woff and /dev/null differ diff --git a/public/fonts/OpenSans-Italic-webfont.eot b/public/fonts/OpenSans-Italic-webfont.eot deleted file mode 100644 index c31595212f..0000000000 Binary files a/public/fonts/OpenSans-Italic-webfont.eot and /dev/null differ diff --git a/public/fonts/OpenSans-Italic-webfont.svg b/public/fonts/OpenSans-Italic-webfont.svg deleted file mode 100644 index 537d20ca6f..0000000000 --- a/public/fonts/OpenSans-Italic-webfont.svg +++ /dev/null @@ -1,251 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Digitized data copyright 20102011 Google Corporation -Foundry : Ascender Corporation -Foundry URL : httpwwwascendercorpcom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/OpenSans-Italic-webfont.ttf b/public/fonts/OpenSans-Italic-webfont.ttf deleted file mode 100644 index cb3fda65e9..0000000000 Binary files a/public/fonts/OpenSans-Italic-webfont.ttf and /dev/null differ diff --git a/public/fonts/OpenSans-Italic-webfont.woff b/public/fonts/OpenSans-Italic-webfont.woff deleted file mode 100644 index 03eaf58618..0000000000 Binary files a/public/fonts/OpenSans-Italic-webfont.woff and /dev/null differ diff --git a/public/fonts/OpenSans-Light-webfont.eot b/public/fonts/OpenSans-Light-webfont.eot deleted file mode 100644 index f17617e039..0000000000 Binary files a/public/fonts/OpenSans-Light-webfont.eot and /dev/null differ diff --git a/public/fonts/OpenSans-Light-webfont.svg b/public/fonts/OpenSans-Light-webfont.svg deleted file mode 100644 index c7ae13a29c..0000000000 --- a/public/fonts/OpenSans-Light-webfont.svg +++ /dev/null @@ -1,252 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Digitized data copyright 20102011 Google Corporation -Foundry : Ascender Corporation -Foundry URL : httpwwwascendercorpcom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/OpenSans-Light-webfont.ttf b/public/fonts/OpenSans-Light-webfont.ttf deleted file mode 100644 index b83078a607..0000000000 Binary files a/public/fonts/OpenSans-Light-webfont.ttf and /dev/null differ diff --git a/public/fonts/OpenSans-Light-webfont.woff b/public/fonts/OpenSans-Light-webfont.woff deleted file mode 100644 index ff882b6aca..0000000000 Binary files a/public/fonts/OpenSans-Light-webfont.woff and /dev/null differ diff --git a/public/fonts/OpenSans-Regular-webfont.eot b/public/fonts/OpenSans-Regular-webfont.eot deleted file mode 100644 index 545b7c15e5..0000000000 Binary files a/public/fonts/OpenSans-Regular-webfont.eot and /dev/null differ diff --git a/public/fonts/OpenSans-Regular-webfont.svg b/public/fonts/OpenSans-Regular-webfont.svg deleted file mode 100644 index ead219a569..0000000000 --- a/public/fonts/OpenSans-Regular-webfont.svg +++ /dev/null @@ -1,252 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Digitized data copyright 20102011 Google Corporation -Foundry : Ascender Corporation -Foundry URL : httpwwwascendercorpcom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/OpenSans-Regular-webfont.ttf b/public/fonts/OpenSans-Regular-webfont.ttf deleted file mode 100644 index a5b2378e5c..0000000000 Binary files a/public/fonts/OpenSans-Regular-webfont.ttf and /dev/null differ diff --git a/public/fonts/OpenSans-Regular-webfont.woff b/public/fonts/OpenSans-Regular-webfont.woff deleted file mode 100644 index 11698afc2c..0000000000 Binary files a/public/fonts/OpenSans-Regular-webfont.woff and /dev/null differ diff --git a/public/fonts/OpenSans-Semibold-webfont.eot b/public/fonts/OpenSans-Semibold-webfont.eot deleted file mode 100644 index acc32c425d..0000000000 Binary files a/public/fonts/OpenSans-Semibold-webfont.eot and /dev/null differ diff --git a/public/fonts/OpenSans-Semibold-webfont.svg b/public/fonts/OpenSans-Semibold-webfont.svg deleted file mode 100644 index 9eaa0b710f..0000000000 --- a/public/fonts/OpenSans-Semibold-webfont.svg +++ /dev/null @@ -1,251 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Digitized data copyright 2011 Google Corporation -Foundry : Ascender Corporation -Foundry URL : httpwwwascendercorpcom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/OpenSans-Semibold-webfont.ttf b/public/fonts/OpenSans-Semibold-webfont.ttf deleted file mode 100644 index a5b9691c1f..0000000000 Binary files a/public/fonts/OpenSans-Semibold-webfont.ttf and /dev/null differ diff --git a/public/fonts/OpenSans-Semibold-webfont.woff b/public/fonts/OpenSans-Semibold-webfont.woff deleted file mode 100644 index 17fb5dc324..0000000000 Binary files a/public/fonts/OpenSans-Semibold-webfont.woff and /dev/null differ diff --git a/run.php b/run.php index dc69bf476c..c5fa2d8d85 100644 --- a/run.php +++ b/run.php @@ -2,7 +2,7 @@ // Only run this if running from php 5.4 embedded server if (php_sapi_name() == 'cli-server') { - if (preg_match('/\.(?:js|ico|gif|jpg|png|css|asc|txt|eot|woff|ttf|ttf|svg)(?:\?.*)?$/', $_SERVER['REQUEST_URI'])) { + if (preg_match('/\.(?:js|ico|gif|jpg|png|css|asc|txt|svg)(?:\?.*)?$/', $_SERVER['REQUEST_URI'])) { // serves fronted if (preg_match('/^\/public/', $_SERVER['REQUEST_URI'])) { return false; diff --git a/templates/hashpassword.phtml b/templates/hashpassword.phtml index d2b8b5c6a2..7c3c402d71 100644 --- a/templates/hashpassword.phtml +++ b/templates/hashpassword.phtml @@ -29,9 +29,6 @@ - - - diff --git a/templates/home.phtml b/templates/home.phtml index f052b0f61c..308a3154a8 100644 --- a/templates/home.phtml +++ b/templates/home.phtml @@ -44,9 +44,6 @@ - - -