From 97fbf91f29ffabe0cc272da801241d30473e634d Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 24 Jun 2019 12:00:07 +0200 Subject: [PATCH] Use native font stack Signed-off-by: Jan-Christoph Borchardt --- apps/accessibility/css/fontdyslexic.scss | 2 +- apps/user_ldap/css/renewPassword.css | 2 +- core/css/fonts.scss | 144 --------------------- core/css/guest.css | 152 +---------------------- core/css/server.scss | 1 - core/css/tooltip.scss | 2 +- core/css/variables.scss | 2 +- 7 files changed, 6 insertions(+), 299 deletions(-) delete mode 100644 core/css/fonts.scss diff --git a/apps/accessibility/css/fontdyslexic.scss b/apps/accessibility/css/fontdyslexic.scss index 8c7a2f51e3..fee1583e62 100644 --- a/apps/accessibility/css/fontdyslexic.scss +++ b/apps/accessibility/css/fontdyslexic.scss @@ -12,4 +12,4 @@ src: url('../fonts/OpenDyslexic-Bold.woff') format('woff'); } -$font-face: OpenDyslexic, 'Noto Sans', '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 36f7054dba..ab6d49eedb 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: 'Noto Sans', '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 195a2beb4a..0000000000 --- a/core/css/fonts.scss +++ /dev/null @@ -1,144 +0,0 @@ -/* cyrillic-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-cyrillic-ext.woff2') format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-cyrillic.woff2') format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* devanagari */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-devanagari.woff2') format('woff2'); - unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB; -} -/* greek-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-greek-ext.woff2') format('woff2'); - unicode-range: U+1F00-1FFF; -} -/* greek */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-greek.woff2') format('woff2'); - unicode-range: U+0370-03FF; -} -/* vietnamese */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-vietnamese.woff2') format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-latin-ext.woff2') format('woff2'); - 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: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-latin.woff2') format('woff2'); - 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; -} -/* cyrillic-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-cyrillic-ext.woff2') format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-cyrillic.woff2') format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* devanagari */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-devanagari.woff2') format('woff2'); - unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB; -} -/* greek-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-greek-ext.woff2') format('woff2'); - unicode-range: U+1F00-1FFF; -} -/* greek */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-greek.woff2') format('woff2'); - unicode-range: U+0370-03FF; -} -/* vietnamese */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-vietnamese.woff2') format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-latin-ext.woff2') format('woff2'); - 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: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-latin.woff2') format('woff2'); - 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 3b0d1efa4d..75fc2d93ea 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: 'Noto Sans', '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: 'Noto Sans', '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,151 +848,3 @@ label.infield, a.legal { font-size: smaller; } - - -/* fonts.scss ---------------------------------------------------- */ - -/* cyrillic-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-cyrillic-ext.woff2') format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-cyrillic.woff2') format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* devanagari */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-devanagari.woff2') format('woff2'); - unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB; -} -/* greek-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-greek-ext.woff2') format('woff2'); - unicode-range: U+1F00-1FFF; -} -/* greek */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-greek.woff2') format('woff2'); - unicode-range: U+0370-03FF; -} -/* vietnamese */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-vietnamese.woff2') format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-latin-ext.woff2') format('woff2'); - 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: 'Noto Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Noto Sans'), local('NotoSans'), url('../fonts/NotoSans-Regular-latin.woff2') format('woff2'); - 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; -} -/* cyrillic-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-cyrillic-ext.woff2') format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-cyrillic.woff2') format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* devanagari */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-devanagari.woff2') format('woff2'); - unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB; -} -/* greek-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-greek-ext.woff2') format('woff2'); - unicode-range: U+1F00-1FFF; -} -/* greek */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-greek.woff2') format('woff2'); - unicode-range: U+0370-03FF; -} -/* vietnamese */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-vietnamese.woff2') format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-latin-ext.woff2') format('woff2'); - 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: 'Noto Sans'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Noto Sans Bold'), local('NotoSans-Bold'), url('../fonts/NotoSans-Bold-latin.woff2') format('woff2'); - 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 a0fc551a18..1d4a79f6cf 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 329d3d75bc..c7bf99c7d1 100644 --- a/core/css/tooltip.scss +++ b/core/css/tooltip.scss @@ -13,7 +13,7 @@ .tooltip { position: absolute; display: block; - font-family: 'Noto Sans', '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 8811e60cc6..7eacdd8f9e 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: 'Noto Sans', '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;