aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2024-09-12 16:37:27 +0200
committerJoas Schilling <coding@schilljs.com>2024-09-12 16:53:13 +0200
commit599a94fc9a848f63dae2fc0623d6f446a993d6ed (patch)
tree69cd37469fcd973dfb8a01db45366183c2df40aa
parent2480567005776cc96d543b52992c83a41d75d1a6 (diff)
downloadnextcloud-server-599a94fc9a848f63dae2fc0623d6f446a993d6ed.tar.gz
nextcloud-server-599a94fc9a848f63dae2fc0623d6f446a993d6ed.zip
fix(a11y): Update OpenDyslexic from 0.920 to 2.001
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--.reuse/dep58
-rw-r--r--apps/theming/fonts/OpenDyslexic-Bold.otfbin230716 -> 42408 bytes
-rw-r--r--apps/theming/fonts/OpenDyslexic-Bold.ttfbin311772 -> 0 bytes
-rw-r--r--apps/theming/fonts/OpenDyslexic-Bold.woffbin135076 -> 0 bytes
-rw-r--r--apps/theming/fonts/OpenDyslexic-Regular.otfbin215772 -> 41088 bytes
-rw-r--r--apps/theming/fonts/OpenDyslexic-Regular.ttfbin308524 -> 0 bytes
-rw-r--r--apps/theming/fonts/OpenDyslexic-Regular.woffbin128784 -> 0 bytes
-rw-r--r--apps/theming/lib/Themes/DyslexiaFont.php14
8 files changed, 7 insertions, 15 deletions
diff --git a/.reuse/dep5 b/.reuse/dep5
index 3228d020f52..37dab9b376a 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 <https://www.pexels.com/photo/green-and-brown-island-on-blue-sea-under-blue-sky-4011450/>
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 <https://abbiecod.es|support@abbiecod.es<, with Reserved Font Name OpenDyslexic.
+Files: apps/theming/fonts/OpenDyslexic-Bold.otf apps/theming/fonts/OpenDyslexic-Regular.otf
+Copyright: 2012-2019 Abbie Gonzalez <https://abbiecod.es|support@abbiecod.es>, 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 7d074cbddee..4c492e2fcc2 100644
--- a/apps/theming/fonts/OpenDyslexic-Bold.otf
+++ b/apps/theming/fonts/OpenDyslexic-Bold.otf
Binary files differ
diff --git a/apps/theming/fonts/OpenDyslexic-Bold.ttf b/apps/theming/fonts/OpenDyslexic-Bold.ttf
deleted file mode 100644
index 25cf37f99e2..00000000000
--- a/apps/theming/fonts/OpenDyslexic-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/apps/theming/fonts/OpenDyslexic-Bold.woff b/apps/theming/fonts/OpenDyslexic-Bold.woff
deleted file mode 100644
index 41886ae9dda..00000000000
--- a/apps/theming/fonts/OpenDyslexic-Bold.woff
+++ /dev/null
Binary files differ
diff --git a/apps/theming/fonts/OpenDyslexic-Regular.otf b/apps/theming/fonts/OpenDyslexic-Regular.otf
index ebef13c4ce3..1226d2ab281 100644
--- a/apps/theming/fonts/OpenDyslexic-Regular.otf
+++ b/apps/theming/fonts/OpenDyslexic-Regular.otf
Binary files differ
diff --git a/apps/theming/fonts/OpenDyslexic-Regular.ttf b/apps/theming/fonts/OpenDyslexic-Regular.ttf
deleted file mode 100644
index 4b0cb8c46b7..00000000000
--- a/apps/theming/fonts/OpenDyslexic-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/apps/theming/fonts/OpenDyslexic-Regular.woff b/apps/theming/fonts/OpenDyslexic-Regular.woff
deleted file mode 100644
index 26a2934d640..00000000000
--- a/apps/theming/fonts/OpenDyslexic-Regular.woff
+++ /dev/null
Binary files differ
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');
}
";
}