Skip to content

Change typeface to Nunito #11932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 12 commits into from
Oct 23, 2018
Merged

Change typeface to Nunito #11932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d9387ad
Move fonts from light/semibold to regular/bold for better readability
jancborchardt Oct 1, 2018
9d05347
Change typeface from Open Sans to Nunito
jancborchardt Oct 17, 2018
2eceb1a
Text color #222 instead of #000 for better readability
jancborchardt Oct 19, 2018
c57c9f4
Add woff2 format of Nunito for better performance in modern browsers
jancborchardt Oct 19, 2018
bcce569
Use normal text color for sections now that it's not full black
jancborchardt Oct 20, 2018
d9aa484
Fix font-face on LDAP tooltip
jancborchardt Oct 23, 2018
0158703
Fix font-face in dyslexia-friendly theme
jancborchardt Oct 23, 2018
ade50d3
Remove font-specifics from high contrast theme because we are now on …
jancborchardt Oct 23, 2018
3259d42
Use correct typeface for txt previews
jancborchardt Oct 23, 2018
354b72b
Use correct typeface for avatar generator
jancborchardt Oct 23, 2018
1fb8856
Fix comment and cap-height
skjnldsv Oct 23, 2018
782927a
fixup! Fix comment and cap-height
skjnldsv Oct 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/accessibility/css/fontdyslexic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
34 changes: 0 additions & 34 deletions apps/accessibility/css/themehighcontrast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/css/renewPassword.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions core/css/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
h2,
h3,
h4 {
font-weight: 600;
font-weight: bold;
}

h2 {
Expand Down Expand Up @@ -727,7 +727,7 @@ kbd {
border-radius: 0;
text-align: left;
padding-left: 42px;
font-weight: 400;
font-weight: normal;

/* like app-navigation a */
color: var(--color-main-text);
Expand All @@ -746,7 +746,6 @@ kbd {
.section {
display: block;
padding: 30px;
color: var(--color-text-lighter);
margin-bottom: 24px;
&.hidden {
display: none !important;
Expand Down Expand Up @@ -794,7 +793,7 @@ kbd {
margin-bottom: 1px;
}
&.selected {
font-weight: 600;
font-weight: bold;
}
&.selected,
&:hover,
Expand Down Expand Up @@ -911,7 +910,7 @@ $popovericon-size: 16px;
align-items: flex-start;
height: auto;
margin: 0;
font-weight: 300;
font-weight: normal;
box-shadow: none;
width: 100%;
color: var(--color-main-text);
Expand Down
51 changes: 34 additions & 17 deletions core/css/fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,43 @@
/* for low-res screens, use Regular font-weight instead of Light */
@media (-webkit-max-device-pixel-ratio: 1.3), (max-resolution: 124.8dpi) {
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: normal;
src: local('Open Sans'), local('OpenSans'),
url('../fonts/OpenSans-Regular.woff') format('woff');
}
/* 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: 'Open Sans';
font-family: 'Nunito';
font-style: normal;
font-weight: 300;
src: local('Open Sans Light'), local('OpenSans-Light'),
url('../fonts/OpenSans-Light.woff') format('woff');
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: 'Open Sans';
font-family: 'Nunito';
font-style: normal;
font-weight: 600;
src: local('Open Sans Semibold'), local('OpenSans-Semibold'),
url('../fonts/OpenSans-Semibold.woff') format('woff');
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;
}
73 changes: 47 additions & 26 deletions core/css/guest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ ul { list-style:none; }

body {
background-color: #ffffff;
font-weight: 400;
font-weight: normal;
font-size: .8em;
line-height: 1.6em;
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
color: #000;
text-align: center;
background-color: #0082c9;
Expand Down Expand Up @@ -56,7 +56,7 @@ em {
h2,
h3,
h4 {
font-weight: 600;
font-weight: bold;
}

h2 {
Expand Down Expand Up @@ -175,7 +175,7 @@ form #datadirField legend {
}

input, textarea, select, button, div[contenteditable=true] {
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
}
input,
input:not([type='range']),
Expand All @@ -198,7 +198,7 @@ select {
min-width: 25px;
padding: 12px;
background-color: white;
font-weight: 600;
font-weight: bold;
color: #555;
border: none;
cursor: pointer;
Expand All @@ -216,7 +216,7 @@ input[type='email'] {
-moz-appearance: textfield;
box-sizing: content-box;
border: none;
font-weight: 300;
font-weight: normal;
}
input.login {
width: 269px;
Expand Down Expand Up @@ -421,7 +421,7 @@ form .warning input[type='checkbox']+label {
margin: 0;
}
.two-factor-provider p {
font-weight: 300;
font-weight: normal;
}
.two-factor-icon {
width: 100px;
Expand Down Expand Up @@ -456,12 +456,12 @@ form .warning input[type='checkbox']+label {
margin: 10px 0;
text-align: center;
width: 100%;
text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background
text-shadow: 0 0 2px rgba(0, 0, 0, .4); /* better readability on bright background */
}
.lost-password-container #lost-password,
.lost-password-container #lost-password-back {
display: inline-block;
font-weight: 300;
font-weight: normal;
padding: 12px;
margin-top: -6px;
color: #fff;
Expand Down Expand Up @@ -607,7 +607,7 @@ form #selectDbType label.ui-state-active {
.warning a,
.error a {
color: #fff !important;
font-weight: 600 !important;
font-weight: bold !important;
opacity: 1;
}
.error a.button {
Expand Down Expand Up @@ -652,7 +652,7 @@ fieldset.update legend + p {
}
p.info {
margin: 20px auto;
text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background
text-shadow: 0 0 2px rgba(0, 0, 0, .4); /* better readability on bright background */
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
Expand Down Expand Up @@ -803,7 +803,7 @@ footer {
}

footer .info .entity-name {
font-weight: 600;
font-weight: bold;
}

.hidden {
Expand All @@ -823,26 +823,47 @@ a.legal {
font-size: smaller;
}

/* for low-res screens, use Regular font-weight instead of Light */
@media (-webkit-max-device-pixel-ratio: 1.3), (max-resolution: 124.8dpi) {
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: normal;
src: local('Open Sans'), local('OpenSans'), url('../fonts/OpenSans-Regular.woff') format('woff');
}

/* 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: 'Open Sans';
font-family: 'Nunito';
font-style: normal;
font-weight: 300;
src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.woff') format('woff');
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: 'Open Sans';
font-family: 'Nunito';
font-style: normal;
font-weight: 600;
src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('../fonts/OpenSans-Semibold.woff') format('woff');
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;
}
2 changes: 1 addition & 1 deletion core/css/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
.header-appname {
color: var(--color-primary-text);
font-size: 16px;
font-weight: 600;
font-weight: bold;
margin: 0;
padding: 0;
padding-right: 5px;
Expand Down
2 changes: 1 addition & 1 deletion core/css/inputs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ button img,
}
select,
.button.multiselect {
font-weight: 400;
font-weight: normal;
}

/* Radio & Checkboxes */
Expand Down
2 changes: 1 addition & 1 deletion core/css/public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ $footer-height: 65px;
color: var(--color-text-lighter);
a {
color: var(--color-text-lighter);
font-weight: 600;
font-weight: bold;
white-space: nowrap;
/* increasing clickability to more than the text height */
padding: 13px;
Expand Down
Loading