diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-09-14 21:19:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-14 21:19:19 +0200 |
| commit | 6a6910f7d434a2f0b0a4e8498fe6d6a2e458a489 (patch) | |
| tree | 42c496e7f0ca727e559e738dc4e4bf309eb6d60f /apps/theming | |
| parent | 6c46c43429e47aa113fe2a58a0529060a81bc7a5 (diff) | |
| parent | 0c224393f500bfbdb74901832f41ed16f8d28e7c (diff) | |
| download | nextcloud-server-6a6910f7d434a2f0b0a4e8498fe6d6a2e458a489.tar.gz nextcloud-server-6a6910f7d434a2f0b0a4e8498fe6d6a2e458a489.zip | |
Merge pull request #47928 from nextcloud/bugfix/noid/update-opendyslexic
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/fonts/OpenDyslexic-Bold.otf | bin | 230716 -> 42408 bytes | |||
| -rw-r--r-- | apps/theming/fonts/OpenDyslexic-Bold.ttf | bin | 311772 -> 0 bytes | |||
| -rw-r--r-- | apps/theming/fonts/OpenDyslexic-Bold.woff | bin | 135076 -> 0 bytes | |||
| -rw-r--r-- | apps/theming/fonts/OpenDyslexic-Regular.otf | bin | 215772 -> 41088 bytes | |||
| -rw-r--r-- | apps/theming/fonts/OpenDyslexic-Regular.ttf | bin | 308524 -> 0 bytes | |||
| -rw-r--r-- | apps/theming/fonts/OpenDyslexic-Regular.woff | bin | 128784 -> 0 bytes | |||
| -rw-r--r-- | apps/theming/lib/Themes/DyslexiaFont.php | 14 | ||||
| -rw-r--r-- | apps/theming/tests/Themes/DyslexiaFontTest.php | 2 |
8 files changed, 4 insertions, 12 deletions
diff --git a/apps/theming/fonts/OpenDyslexic-Bold.otf b/apps/theming/fonts/OpenDyslexic-Bold.otf Binary files differindex 7d074cbddee..4c492e2fcc2 100644 --- a/apps/theming/fonts/OpenDyslexic-Bold.otf +++ b/apps/theming/fonts/OpenDyslexic-Bold.otf diff --git a/apps/theming/fonts/OpenDyslexic-Bold.ttf b/apps/theming/fonts/OpenDyslexic-Bold.ttf Binary files differdeleted file mode 100644 index 25cf37f99e2..00000000000 --- a/apps/theming/fonts/OpenDyslexic-Bold.ttf +++ /dev/null diff --git a/apps/theming/fonts/OpenDyslexic-Bold.woff b/apps/theming/fonts/OpenDyslexic-Bold.woff Binary files differdeleted file mode 100644 index 41886ae9dda..00000000000 --- a/apps/theming/fonts/OpenDyslexic-Bold.woff +++ /dev/null diff --git a/apps/theming/fonts/OpenDyslexic-Regular.otf b/apps/theming/fonts/OpenDyslexic-Regular.otf Binary files differindex ebef13c4ce3..1226d2ab281 100644 --- a/apps/theming/fonts/OpenDyslexic-Regular.otf +++ b/apps/theming/fonts/OpenDyslexic-Regular.otf diff --git a/apps/theming/fonts/OpenDyslexic-Regular.ttf b/apps/theming/fonts/OpenDyslexic-Regular.ttf Binary files differdeleted file mode 100644 index 4b0cb8c46b7..00000000000 --- a/apps/theming/fonts/OpenDyslexic-Regular.ttf +++ /dev/null diff --git a/apps/theming/fonts/OpenDyslexic-Regular.woff b/apps/theming/fonts/OpenDyslexic-Regular.woff Binary files differdeleted file mode 100644 index 26a2934d640..00000000000 --- a/apps/theming/fonts/OpenDyslexic-Regular.woff +++ /dev/null diff --git a/apps/theming/lib/Themes/DyslexiaFont.php b/apps/theming/lib/Themes/DyslexiaFont.php index 2552fc65724..2448de7b3c8 100644 --- a/apps/theming/lib/Themes/DyslexiaFont.php +++ b/apps/theming/lib/Themes/DyslexiaFont.php @@ -43,30 +43,22 @@ class DyslexiaFont extends DefaultTheme implements ITheme { } 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 05f489449b8..99b6f8cfc8e 100644 --- a/apps/theming/tests/Themes/DyslexiaFontTest.php +++ b/apps/theming/tests/Themes/DyslexiaFontTest.php @@ -163,7 +163,7 @@ class DyslexiaFontTest extends TestCase { ->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()); } } |