diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2019-06-26 00:08:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 00:08:16 +0200 |
| commit | b466127b1f470365670beb8cd85f78451acd669d (patch) | |
| tree | 8c710e118c6fc49a70c9bb281fefb04d72f28b37 /apps | |
| parent | a47403d5f85b2ebe2fa14672181b8ce0b6122d34 (diff) | |
| parent | 97fbf91f29ffabe0cc272da801241d30473e634d (diff) | |
| download | nextcloud-server-b466127b1f470365670beb8cd85f78451acd669d.tar.gz nextcloud-server-b466127b1f470365670beb8cd85f78451acd669d.zip | |
Merge pull request #16055 from nextcloud/design/native-fonts
Use native font stack
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/accessibility/css/fontdyslexic.scss | 13 | ||||
| -rw-r--r-- | apps/user_ldap/css/renewPassword.css | 2 |
2 files changed, 4 insertions, 11 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; |