aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2019-06-26 00:08:16 +0200
committerGitHub <noreply@github.com>2019-06-26 00:08:16 +0200
commitb466127b1f470365670beb8cd85f78451acd669d (patch)
tree8c710e118c6fc49a70c9bb281fefb04d72f28b37
parenta47403d5f85b2ebe2fa14672181b8ce0b6122d34 (diff)
parent97fbf91f29ffabe0cc272da801241d30473e634d (diff)
downloadnextcloud-server-b466127b1f470365670beb8cd85f78451acd669d.tar.gz
nextcloud-server-b466127b1f470365670beb8cd85f78451acd669d.zip
Merge pull request #16055 from nextcloud/design/native-fonts
Use native font stack
-rw-r--r--apps/accessibility/css/fontdyslexic.scss13
-rw-r--r--apps/user_ldap/css/renewPassword.css2
-rw-r--r--core/css/fonts.scss43
-rw-r--r--core/css/guest.css49
-rw-r--r--core/css/server.scss1
-rw-r--r--core/css/tooltip.scss2
-rw-r--r--core/css/variables.scss2
-rw-r--r--core/fonts/LICENSE_OFL.txt (renamed from core/fonts/OFL.txt)51
-rw-r--r--core/fonts/NotoSans-Bold-cyrillic-ext.woff2bin0 -> 21704 bytes
-rw-r--r--core/fonts/NotoSans-Bold-cyrillic.woff2bin0 -> 10812 bytes
-rw-r--r--core/fonts/NotoSans-Bold-devanagari.woff2bin0 -> 30624 bytes
-rw-r--r--core/fonts/NotoSans-Bold-greek-ext.woff2bin0 -> 8636 bytes
-rw-r--r--core/fonts/NotoSans-Bold-greek.woff2bin0 -> 13156 bytes
-rw-r--r--core/fonts/NotoSans-Bold-latin-ext.woff2bin0 -> 32876 bytes
-rw-r--r--core/fonts/NotoSans-Bold-latin.woff2bin0 -> 16180 bytes
-rw-r--r--core/fonts/NotoSans-Bold-vietnamese.woff2bin0 -> 7512 bytes
-rw-r--r--core/fonts/NotoSans-Bold.ttfbin0 -> 455164 bytes
-rw-r--r--core/fonts/NotoSans-Regular-cyrillic-ext.woff2bin0 -> 21748 bytes
-rw-r--r--core/fonts/NotoSans-Regular-cyrillic.woff2bin0 -> 10504 bytes
-rw-r--r--core/fonts/NotoSans-Regular-devanagari.woff2bin0 -> 32656 bytes
-rw-r--r--core/fonts/NotoSans-Regular-greek-ext.woff2bin0 -> 8508 bytes
-rw-r--r--core/fonts/NotoSans-Regular-greek.woff2bin0 -> 12896 bytes
-rw-r--r--core/fonts/NotoSans-Regular-latin-ext.woff2bin0 -> 32524 bytes
-rw-r--r--core/fonts/NotoSans-Regular-latin.woff2bin0 -> 16056 bytes
-rw-r--r--core/fonts/NotoSans-Regular-vietnamese.woff2bin0 -> 7544 bytes
-rw-r--r--core/fonts/NotoSans-Regular.ttfbin0 -> 455188 bytes
-rw-r--r--core/fonts/Nunito-Bold-latin-ext.woff2bin18912 -> 0 bytes
-rw-r--r--core/fonts/Nunito-Bold.ttfbin115852 -> 0 bytes
-rw-r--r--core/fonts/Nunito-Bold.woff2bin19748 -> 0 bytes
-rw-r--r--core/fonts/Nunito-Regular-latin-ext.woff2bin18504 -> 0 bytes
-rw-r--r--core/fonts/Nunito-Regular.ttfbin113832 -> 0 bytes
-rw-r--r--core/fonts/Nunito-Regular.woff2bin19600 -> 0 bytes
-rw-r--r--core/js/tests/specs/setupchecksSpec.js4
-rw-r--r--lib/private/Avatar/Avatar.php10
-rw-r--r--lib/private/Preview/TXT.php2
-rw-r--r--settings/js/admin.js2
-rw-r--r--tests/lib/Avatar/UserAvatarTest.php2
37 files changed, 43 insertions, 140 deletions
diff --git a/apps/accessibility/css/fontdyslexic.scss b/apps/accessibility/css/fontdyslexic.scss
index 45638271f90..fee1583e620 100644
--- a/apps/accessibility/css/fontdyslexic.scss
+++ b/apps/accessibility/css/fontdyslexic.scss
@@ -1,22 +1,15 @@
@font-face {
font-family: 'OpenDyslexic';
font-style: normal;
- font-weight: 300;
+ font-weight: 400;
src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
}
@font-face {
font-family: 'OpenDyslexic';
font-style: normal;
- font-weight: normal;
- src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
-}
-
-@font-face {
- font-family: 'OpenDyslexic';
- font-style: normal;
- font-weight: 600;
+ font-weight: 700;
src: url('../fonts/OpenDyslexic-Bold.woff') format('woff');
}
-$font-face: OpenDyslexic, 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+$font-face: OpenDyslexic, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
diff --git a/apps/user_ldap/css/renewPassword.css b/apps/user_ldap/css/renewPassword.css
index 9f49dc23cae..ab6d49eedb7 100644
--- a/apps/user_ldap/css/renewPassword.css
+++ b/apps/user_ldap/css/renewPassword.css
@@ -22,7 +22,7 @@
.tooltip {
position:absolute;
display:block;
- font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
font-style:normal;
font-weight:400;
letter-spacing:normal;
diff --git a/core/css/fonts.scss b/core/css/fonts.scss
deleted file mode 100644
index 1e0b14af22f..00000000000
--- a/core/css/fonts.scss
+++ /dev/null
@@ -1,43 +0,0 @@
-/* latin-ext */
-@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 400; /* normal */
- src: local('Nunito Regular'), local('Nunito-Regular'),
- url('../fonts/Nunito-Regular-latin-ext.woff2') format('woff2'),
- url('../fonts/Nunito-Regular.ttf') format('truetype');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 400; /* normal */
- src: local('Nunito Regular'), local('Nunito-Regular'),
- url('../fonts/Nunito-Regular.woff2') format('woff2'),
- url('../fonts/Nunito-Regular.ttf') format('truetype');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* latin-ext */
-@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 700; /* bold */
- src: local('Nunito Bold'), local('Nunito-Bold'),
- url('../fonts/Nunito-Bold-latin-ext.woff2') format('woff2'),
- url('../fonts/Nunito-Bold.ttf') format('truetype');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 700; /* bold */
- src: local('Nunito Bold'), local('Nunito-Bold'),
- url('../fonts/Nunito-Bold.woff2') format('woff2'),
- url('../fonts/Nunito-Bold.ttf') format('truetype');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
diff --git a/core/css/guest.css b/core/css/guest.css
index 57fe966d26f..75fc2d93ea8 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -19,7 +19,7 @@ body {
font-weight: normal;
font-size: .8em;
line-height: 1.6em;
- font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
color: #000;
text-align: center;
background-color: #0082c9;
@@ -183,7 +183,7 @@ form #datadirField legend {
input, textarea, select, button, div[contenteditable=true] {
- font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
}
input,
input:not([type='range']),
@@ -848,48 +848,3 @@ label.infield,
a.legal {
font-size: smaller;
}
-
-
-/* latin-ext */
-@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 400; /* normal */
- src: local('Nunito Regular'), local('Nunito-Regular'),
- url('../fonts/Nunito-Regular-latin-ext.woff2') format('woff2'),
- url('../fonts/Nunito-Regular.ttf') format('truetype');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 400; /* normal */
- src: local('Nunito Regular'), local('Nunito-Regular'),
- url('../fonts/Nunito-Regular.woff2') format('woff2'),
- url('../fonts/Nunito-Regular.ttf') format('truetype');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* latin-ext */
-@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 700; /* bold */
- src: local('Nunito Bold'), local('Nunito-Bold'),
- url('../fonts/Nunito-Bold-latin-ext.woff2') format('woff2'),
- url('../fonts/Nunito-Bold.ttf') format('truetype');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 700; /* bold */
- src: local('Nunito Bold'), local('Nunito-Bold'),
- url('../fonts/Nunito-Bold.woff2') format('woff2'),
- url('../fonts/Nunito-Bold.ttf') format('truetype');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
diff --git a/core/css/server.scss b/core/css/server.scss
index a0fc551a187..1d4a79f6cf8 100644
--- a/core/css/server.scss
+++ b/core/css/server.scss
@@ -2,7 +2,6 @@
@import 'inputs.scss';
@import 'header.scss';
@import 'icons.scss';
-@import 'fonts.scss';
@import 'apps.scss';
@import 'global.scss';
@import 'fixes.scss';
diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss
index ca08e5808c4..c7bf99c7d11 100644
--- a/core/css/tooltip.scss
+++ b/core/css/tooltip.scss
@@ -13,7 +13,7 @@
.tooltip {
position: absolute;
display: block;
- font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+ font-family: var(--font-face);
font-style: normal;
font-weight: normal;
letter-spacing: normal;
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 960371c2536..7eacdd8f9e4 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -79,7 +79,7 @@ $border-radius-large: 10px !default;
// Pill-style button, value is large so big buttons also have correct roundness
$border-radius-pill: 100px !default;
-$font-face: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !default;
+$font-face: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
$animation-quick: 100ms;
$animation-slow: 300ms;
diff --git a/core/fonts/OFL.txt b/core/fonts/LICENSE_OFL.txt
index 601d961cd90..d952d62c065 100644
--- a/core/fonts/OFL.txt
+++ b/core/fonts/LICENSE_OFL.txt
@@ -1,29 +1,28 @@
-Copyright 2014 The Nunito Project Authors (contact@sansoxygen.com)
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
+fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
@@ -33,25 +32,25 @@ include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
@@ -61,9 +60,9 @@ in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
@@ -74,8 +73,8 @@ permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
+remain under this license does not apply to any document created using
+the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
diff --git a/core/fonts/NotoSans-Bold-cyrillic-ext.woff2 b/core/fonts/NotoSans-Bold-cyrillic-ext.woff2
new file mode 100644
index 00000000000..d3a6ecb475a
--- /dev/null
+++ b/core/fonts/NotoSans-Bold-cyrillic-ext.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Bold-cyrillic.woff2 b/core/fonts/NotoSans-Bold-cyrillic.woff2
new file mode 100644
index 00000000000..937e522c7e8
--- /dev/null
+++ b/core/fonts/NotoSans-Bold-cyrillic.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Bold-devanagari.woff2 b/core/fonts/NotoSans-Bold-devanagari.woff2
new file mode 100644
index 00000000000..905be683724
--- /dev/null
+++ b/core/fonts/NotoSans-Bold-devanagari.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Bold-greek-ext.woff2 b/core/fonts/NotoSans-Bold-greek-ext.woff2
new file mode 100644
index 00000000000..01db534189d
--- /dev/null
+++ b/core/fonts/NotoSans-Bold-greek-ext.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Bold-greek.woff2 b/core/fonts/NotoSans-Bold-greek.woff2
new file mode 100644
index 00000000000..627e7f1ef8b
--- /dev/null
+++ b/core/fonts/NotoSans-Bold-greek.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Bold-latin-ext.woff2 b/core/fonts/NotoSans-Bold-latin-ext.woff2
new file mode 100644
index 00000000000..8b580a51948
--- /dev/null
+++ b/core/fonts/NotoSans-Bold-latin-ext.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Bold-latin.woff2 b/core/fonts/NotoSans-Bold-latin.woff2
new file mode 100644
index 00000000000..1f16cc33d53
--- /dev/null
+++ b/core/fonts/NotoSans-Bold-latin.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Bold-vietnamese.woff2 b/core/fonts/NotoSans-Bold-vietnamese.woff2
new file mode 100644
index 00000000000..d57f6d39e11
--- /dev/null
+++ b/core/fonts/NotoSans-Bold-vietnamese.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Bold.ttf b/core/fonts/NotoSans-Bold.ttf
new file mode 100644
index 00000000000..ab11d316397
--- /dev/null
+++ b/core/fonts/NotoSans-Bold.ttf
Binary files differ
diff --git a/core/fonts/NotoSans-Regular-cyrillic-ext.woff2 b/core/fonts/NotoSans-Regular-cyrillic-ext.woff2
new file mode 100644
index 00000000000..ec414480000
--- /dev/null
+++ b/core/fonts/NotoSans-Regular-cyrillic-ext.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Regular-cyrillic.woff2 b/core/fonts/NotoSans-Regular-cyrillic.woff2
new file mode 100644
index 00000000000..882cbba0988
--- /dev/null
+++ b/core/fonts/NotoSans-Regular-cyrillic.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Regular-devanagari.woff2 b/core/fonts/NotoSans-Regular-devanagari.woff2
new file mode 100644
index 00000000000..f76bdc4de1d
--- /dev/null
+++ b/core/fonts/NotoSans-Regular-devanagari.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Regular-greek-ext.woff2 b/core/fonts/NotoSans-Regular-greek-ext.woff2
new file mode 100644
index 00000000000..70c40413a3a
--- /dev/null
+++ b/core/fonts/NotoSans-Regular-greek-ext.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Regular-greek.woff2 b/core/fonts/NotoSans-Regular-greek.woff2
new file mode 100644
index 00000000000..d95083535a5
--- /dev/null
+++ b/core/fonts/NotoSans-Regular-greek.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Regular-latin-ext.woff2 b/core/fonts/NotoSans-Regular-latin-ext.woff2
new file mode 100644
index 00000000000..62becf88cb9
--- /dev/null
+++ b/core/fonts/NotoSans-Regular-latin-ext.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Regular-latin.woff2 b/core/fonts/NotoSans-Regular-latin.woff2
new file mode 100644
index 00000000000..cf2b74a64dd
--- /dev/null
+++ b/core/fonts/NotoSans-Regular-latin.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Regular-vietnamese.woff2 b/core/fonts/NotoSans-Regular-vietnamese.woff2
new file mode 100644
index 00000000000..6d331d80b2d
--- /dev/null
+++ b/core/fonts/NotoSans-Regular-vietnamese.woff2
Binary files differ
diff --git a/core/fonts/NotoSans-Regular.ttf b/core/fonts/NotoSans-Regular.ttf
new file mode 100644
index 00000000000..a1b8994edea
--- /dev/null
+++ b/core/fonts/NotoSans-Regular.ttf
Binary files differ
diff --git a/core/fonts/Nunito-Bold-latin-ext.woff2 b/core/fonts/Nunito-Bold-latin-ext.woff2
deleted file mode 100644
index d69ce0d32e9..00000000000
--- a/core/fonts/Nunito-Bold-latin-ext.woff2
+++ /dev/null
Binary files differ
diff --git a/core/fonts/Nunito-Bold.ttf b/core/fonts/Nunito-Bold.ttf
deleted file mode 100644
index d2037334825..00000000000
--- a/core/fonts/Nunito-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/core/fonts/Nunito-Bold.woff2 b/core/fonts/Nunito-Bold.woff2
deleted file mode 100644
index fef6db672d6..00000000000
--- a/core/fonts/Nunito-Bold.woff2
+++ /dev/null
Binary files differ
diff --git a/core/fonts/Nunito-Regular-latin-ext.woff2 b/core/fonts/Nunito-Regular-latin-ext.woff2
deleted file mode 100644
index 8c7dd0f9898..00000000000
--- a/core/fonts/Nunito-Regular-latin-ext.woff2
+++ /dev/null
Binary files differ
diff --git a/core/fonts/Nunito-Regular.ttf b/core/fonts/Nunito-Regular.ttf
deleted file mode 100644
index 93a3f3e78ea..00000000000
--- a/core/fonts/Nunito-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/core/fonts/Nunito-Regular.woff2 b/core/fonts/Nunito-Regular.woff2
deleted file mode 100644
index 28b65a12e67..00000000000
--- a/core/fonts/Nunito-Regular.woff2
+++ /dev/null
Binary files differ
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index b5248add984..2f28dcdaef7 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -145,7 +145,7 @@ describe('OC.SetupChecks tests', function() {
describe('checkWOFF2Loading', function() {
it('should fail with another response status code than the expected one', function(done) {
- var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), 'http://example.org/PLACEHOLDER');
+ var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), 'http://example.org/PLACEHOLDER');
suite.server.requests[0].respond(302);
@@ -159,7 +159,7 @@ describe('OC.SetupChecks tests', function() {
});
it('should return no error with the expected response status code', function(done) {
- var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), 'http://example.org/PLACEHOLDER');
+ var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), 'http://example.org/PLACEHOLDER');
suite.server.requests[0].respond(200);
diff --git a/lib/private/Avatar/Avatar.php b/lib/private/Avatar/Avatar.php
index 4468af82053..172f47d12a8 100644
--- a/lib/private/Avatar/Avatar.php
+++ b/lib/private/Avatar/Avatar.php
@@ -50,8 +50,8 @@ abstract class Avatar implements IAvatar {
/**
* https://github.com/sebdesign/cap-height -- for 500px height
* Automated check: https://codepen.io/skjnldsv/pen/PydLBK/
- * Nunito cap-height is 0.716 and we want a 200px caps height size
- * (0.4 letter-to-total-height ratio, 500*0.4=200), so: 200/0.716 = 279px.
+ * Noto Sans cap-height is 0.715 and we want a 200px caps height size
+ * (0.4 letter-to-total-height ratio, 500*0.4=200), so: 200/0.715 = 280px.
* Since we start from the baseline (text-anchor) we need to
* shift the y axis by 100px (half the caps height): 500/2+100=350
*
@@ -60,7 +60,7 @@ abstract class Avatar implements IAvatar {
private $svgTemplate = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="{size}" height="{size}" version="1.1" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
<rect width="100%" height="100%" fill="#{fill}"></rect>
- <text x="50%" y="350" style="font-weight:normal;font-size:279px;font-family:\'Nunito\';text-anchor:middle;fill:#fff">{letter}</text>
+ <text x="50%" y="350" style="font-weight:normal;font-size:280px;font-family:\'Noto Sans\';text-anchor:middle;fill:#fff">{letter}</text>
</svg>';
/**
@@ -141,7 +141,7 @@ abstract class Avatar implements IAvatar {
return false;
}
try {
- $font = __DIR__ . '/../../core/fonts/Nunito-Regular.ttf';
+ $font = __DIR__ . '/../../core/fonts/NotoSans-Regular.ttf';
$svg = $this->getAvatarVector($size);
$avatar = new Imagick();
$avatar->setFont($font);
@@ -176,7 +176,7 @@ abstract class Avatar implements IAvatar {
$white = imagecolorallocate($im, 255, 255, 255);
imagefilledrectangle($im, 0, 0, $size, $size, $background);
- $font = __DIR__ . '/../../../core/fonts/Nunito-Regular.ttf';
+ $font = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
$fontSize = $size * 0.4;
list($x, $y) = $this->imageTTFCenter(
diff --git a/lib/private/Preview/TXT.php b/lib/private/Preview/TXT.php
index 1ac98d62338..3e2032df2de 100644
--- a/lib/private/Preview/TXT.php
+++ b/lib/private/Preview/TXT.php
@@ -74,7 +74,7 @@ class TXT extends ProviderV2 {
$fontFile = __DIR__;
$fontFile .= '/../../../core';
- $fontFile .= '/fonts/Nunito-Regular.ttf';
+ $fontFile .= '/fonts/NotoSans-Regular.ttf';
$canUseTTF = function_exists('imagettftext');
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 6074a3ae2c9..6f3db81655d 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -255,7 +255,7 @@ $(document).ready(function(){
OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocs-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
OC.SetupChecks.checkSetup(),
OC.SetupChecks.checkGeneric(),
- OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), OC.theme.docPlaceholderUrl),
+ OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), OC.theme.docPlaceholderUrl),
OC.SetupChecks.checkDataProtected()
).then(function (check1, check2, check3, check4, check5, check6, check7, check8, check9, check10) {
var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10);
diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php
index 049725c78c9..061866bedb0 100644
--- a/tests/lib/Avatar/UserAvatarTest.php
+++ b/tests/lib/Avatar/UserAvatarTest.php
@@ -235,7 +235,7 @@ class UserAvatarTest extends \Test\TestCase {
$svg = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
<rect width="100%" height="100%" fill="#0082c9"></rect>
- <text x="50%" y="350" style="font-weight:normal;font-size:279px;font-family:\'Nunito\';text-anchor:middle;fill:#fff">A</text>
+ <text x="50%" y="350" style="font-weight:normal;font-size:280px;font-family:\'Noto Sans\';text-anchor:middle;fill:#fff">A</text>
</svg>';
$this->assertEquals($avatar, $svg);
}