diff --git a/.reuse/dep5 b/.reuse/dep5 index 3228d020f52e4..37dab9b376ade 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -15,7 +15,7 @@ Files: .tx/config Copyright: 2011-2012 ownCloud, Inc., 2017-2023 Nextcloud GmbH and Nextcloud contributors License: AGPL-3.0-only -Files: .htaccess +Files: .htaccess Copyright: 2011-2016 ownCloud, Inc., 2016-2024 Nextcloud GmbH and Nextcloud contributors License: AGPL-3.0-only @@ -204,7 +204,7 @@ Copyright: 2016-2024 Collabora Ltd. License: LicenseRef-CollaboraTrademarks Files: core/img/twitter.svg core/img/actions/twitter.svg apps/federatedfilesharing/img/social-twitter.svg -Copyright: X Corp. +Copyright: X Corp. License: LicenseRef-XTrademarks Files: core/img/facebook.svg apps/federatedfilesharing/img/social-facebook.svg @@ -327,6 +327,6 @@ Files: apps/settings/tests/UserMigration/assets/account.png Copyright: 2019 Fabian Wiktor License: CC0-1.0 -Files: apps/theming/fonts/OpenDyslexic-Bold.otf apps/theming/fonts/OpenDyslexic-Bold.ttf apps/theming/fonts/OpenDyslexic-Bold.woff apps/theming/fonts/OpenDyslexic-Regular.otf apps/theming/fonts/OpenDyslexic-Regular.ttf apps/theming/fonts/OpenDyslexic-Regular.woff -Copyright: 2012-2019 Abbie Gonzalez , with Reserved Font Name OpenDyslexic. License: OFL-1.1-RFN diff --git a/apps/theming/fonts/OpenDyslexic-Bold.otf b/apps/theming/fonts/OpenDyslexic-Bold.otf index 7d074cbddeef9..4c492e2fcc283 100644 Binary files a/apps/theming/fonts/OpenDyslexic-Bold.otf and b/apps/theming/fonts/OpenDyslexic-Bold.otf differ diff --git a/apps/theming/fonts/OpenDyslexic-Bold.ttf b/apps/theming/fonts/OpenDyslexic-Bold.ttf deleted file mode 100644 index 25cf37f99e21f..0000000000000 Binary files a/apps/theming/fonts/OpenDyslexic-Bold.ttf and /dev/null differ diff --git a/apps/theming/fonts/OpenDyslexic-Bold.woff b/apps/theming/fonts/OpenDyslexic-Bold.woff deleted file mode 100644 index 41886ae9ddaf2..0000000000000 Binary files a/apps/theming/fonts/OpenDyslexic-Bold.woff and /dev/null differ diff --git a/apps/theming/fonts/OpenDyslexic-Regular.otf b/apps/theming/fonts/OpenDyslexic-Regular.otf index ebef13c4ce374..1226d2ab28190 100644 Binary files a/apps/theming/fonts/OpenDyslexic-Regular.otf and b/apps/theming/fonts/OpenDyslexic-Regular.otf differ diff --git a/apps/theming/fonts/OpenDyslexic-Regular.ttf b/apps/theming/fonts/OpenDyslexic-Regular.ttf deleted file mode 100644 index 4b0cb8c46b79f..0000000000000 Binary files a/apps/theming/fonts/OpenDyslexic-Regular.ttf and /dev/null differ diff --git a/apps/theming/fonts/OpenDyslexic-Regular.woff b/apps/theming/fonts/OpenDyslexic-Regular.woff deleted file mode 100644 index 26a2934d64055..0000000000000 Binary files a/apps/theming/fonts/OpenDyslexic-Regular.woff and /dev/null differ diff --git a/apps/theming/lib/Themes/DyslexiaFont.php b/apps/theming/lib/Themes/DyslexiaFont.php index 2552fc6572464..2448de7b3c8c2 100644 --- a/apps/theming/lib/Themes/DyslexiaFont.php +++ b/apps/theming/lib/Themes/DyslexiaFont.php @@ -43,30 +43,22 @@ public function getCSSVariables(): array { } public function getCustomCss(): string { - $fontPathWoff = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.woff'); $fontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.otf'); - $fontPathTtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.ttf'); - $boldFontPathWoff = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.woff'); $boldFontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.otf'); - $boldFontPathTtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.ttf'); return " @font-face { font-family: 'OpenDyslexic'; font-style: normal; font-weight: 400; - src: url('$fontPathWoff') format('woff'), - url('$fontPathOtf') format('opentype'), - url('$fontPathTtf') format('truetype'); + src: url('$fontPathOtf') format('opentype'); } - + @font-face { font-family: 'OpenDyslexic'; font-style: normal; font-weight: 700; - src: url('$boldFontPathWoff') format('woff'), - url('$boldFontPathOtf') format('opentype'), - url('$boldFontPathTtf') format('truetype'); + src: url('$boldFontPathOtf') format('opentype'); } "; } diff --git a/apps/theming/tests/Themes/DyslexiaFontTest.php b/apps/theming/tests/Themes/DyslexiaFontTest.php index 05f489449b881..99b6f8cfc8e95 100644 --- a/apps/theming/tests/Themes/DyslexiaFontTest.php +++ b/apps/theming/tests/Themes/DyslexiaFontTest.php @@ -163,7 +163,7 @@ public function testGetCustomCss($webRoot, $prettyUrlsEnabled) { ->with('htaccess.IgnoreFrontController', false) ->willReturn($prettyUrlsEnabled); - $this->assertStringContainsString("'$webRoot/apps/theming/fonts/OpenDyslexic-Regular.woff'", $this->dyslexiaFont->getCustomCss()); + $this->assertStringContainsString("'$webRoot/apps/theming/fonts/OpenDyslexic-Regular.otf'", $this->dyslexiaFont->getCustomCss()); $this->assertStringNotContainsString('index.php', $this->dyslexiaFont->getCustomCss()); } }