diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-23 15:14:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 15:14:10 +0200 |
| commit | 171fe69db7cbb674ff80ea4ed6d3506d5c409a05 (patch) | |
| tree | ec827f7e913c6b654b5b2ba535f3c682803069ff /apps | |
| parent | a11bef25a2dbc587f36a08dbb7384518d8f33860 (diff) | |
| parent | 782927a05f6d3340aaf28a26c0c3075f5cafc430 (diff) | |
| download | nextcloud-server-171fe69db7cbb674ff80ea4ed6d3506d5c409a05.tar.gz nextcloud-server-171fe69db7cbb674ff80ea4ed6d3506d5c409a05.zip | |
Merge pull request #11932 from nextcloud/font-nunito
Change typeface to Nunito
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/accessibility/css/fontdyslexic.scss | 2 | ||||
| -rw-r--r-- | apps/accessibility/css/themehighcontrast.scss | 34 | ||||
| -rw-r--r-- | apps/user_ldap/css/renewPassword.css | 2 |
3 files changed, 2 insertions, 36 deletions
diff --git a/apps/accessibility/css/fontdyslexic.scss b/apps/accessibility/css/fontdyslexic.scss index 5df9bfb566c..45638271f90 100644 --- a/apps/accessibility/css/fontdyslexic.scss +++ b/apps/accessibility/css/fontdyslexic.scss @@ -19,4 +19,4 @@ src: url('../fonts/OpenDyslexic-Bold.woff') format('woff'); } -$font-face: OpenDyslexic, 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; +$font-face: OpenDyslexic, 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; diff --git a/apps/accessibility/css/themehighcontrast.scss b/apps/accessibility/css/themehighcontrast.scss index 3d371365d56..ad6f9a5642a 100644 --- a/apps/accessibility/css/themehighcontrast.scss +++ b/apps/accessibility/css/themehighcontrast.scss @@ -1,29 +1,3 @@ -// Fonts -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: normal; - src: local('Open Sans'), local('OpenSans'), - url('../../../core/fonts/OpenSans-Regular.woff') format('woff'); -} - -/* overriding default light */ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 300; - src: local('Open Sans'), local('OpenSans'), - url('../../../core/fonts/OpenSans-Regular.woff') format('woff'); -} - -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 500 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), - url('../../../core/fonts/OpenSans-Bold.woff') format('woff'); -} - // SCSS variables $color-main-text: #000; $color-main-background: #fff; @@ -43,14 +17,6 @@ $color-box-shadow: $color-main-text; $color-border: darken($color-main-background, 50%); $color-border-dark: darken($color-main-background, 50%); -$font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; - - -// Font weight reset -body { - font-weight: 400; -} - [class^='icon-'], [class*=' icon-'], .action { opacity: 1 !important; diff --git a/apps/user_ldap/css/renewPassword.css b/apps/user_ldap/css/renewPassword.css index 7493789eab0..9f49dc23cae 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:'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; + font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; font-style:normal; font-weight:400; letter-spacing:normal; |