Merge pull request #16055 from nextcloud/design/native-fonts

Use native font stack

5 files changed, 4 insertions, 93 deletions

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;