Skip to content

Removed duplicate font-face, now handled by moonstone #185

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
merged 2 commits into from
Jan 6, 2021
Merged

Removed duplicate font-face, now handled by moonstone #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972b2ef
Removed duplicate font-face, now handled by moonstone
Jan 6, 2021
ea9e8b4
deleted files
Jan 6, 2021
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
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-300.eot
View file
Open in desktop
Binary file not shown.
309 changes: 0 additions & 309 deletions packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-300.svg
View file
Open in desktop

This file was deleted.

Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-300.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-300.woff
View file
Open in desktop
Binary file not shown.
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-300.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-600.eot
View file
Open in desktop
Binary file not shown.
307 changes: 0 additions & 307 deletions packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-600.svg
View file
Open in desktop

This file was deleted.

Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-600.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-600.woff
View file
Open in desktop
Binary file not shown.
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-600.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-regular.eot
View file
Open in desktop
Binary file not shown.
308 changes: 0 additions & 308 deletions packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-regular.svg
View file
Open in desktop

This file was deleted.

Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-regular.woff
View file
Open in desktop
Binary file not shown.
Binary file removed packages/design-system-kit/resources/fonts/nunito-sans-v3-latin-regular.woff2
View file
Open in desktop
Binary file not shown.
42 changes: 0 additions & 42 deletions packages/design-system-kit/src/theme/default/typography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,7 @@
// We use require and not import to not include the binary file to the generated *.umd.js
import NunitoSansRegular from '../../../resources/fonts/nunito-sans-v3-latin-regular.woff';
import NunitoSansRegular2 from '../../../resources/fonts/nunito-sans-v3-latin-regular.woff2';
import NunitoSansRegularTtf from '../../../resources/fonts/nunito-sans-v3-latin-regular.ttf';
import NunitoSansRegularEot from '../../../resources/fonts/nunito-sans-v3-latin-regular.eot';
import NunitoSansBold from '../../../resources/fonts/nunito-sans-v3-latin-600.woff';
import NunitoSansBold2 from '../../../resources/fonts/nunito-sans-v3-latin-600.woff2';
import NunitoSansBoldTtf from '../../../resources/fonts/nunito-sans-v3-latin-600.ttf';
import NunitoSansBoldEot from '../../../resources/fonts/nunito-sans-v3-latin-600.eot';
import NunitoSansLight from '../../../resources/fonts/nunito-sans-v3-latin-300.woff';
import NunitoSansLight2 from '../../../resources/fonts/nunito-sans-v3-latin-300.woff2';
import NunitoSansLightTtf from '../../../resources/fonts/nunito-sans-v3-latin-300.ttf';
import NunitoSansLightEot from '../../../resources/fonts/nunito-sans-v3-latin-300.eot';

let dsTypography = theme => (
{
'@font-face': [{
fontFamily: 'Nunito Sans',
fontWeight: '300',
src: [
'url(\'' + NunitoSansLight2 + '\') format(\'woff2\')',
'url(\'' + NunitoSansLight + '\') format(\'woff\')',
'url(\'' + NunitoSansLightTtf + '\') format(\'truetype\')',
'url(\'' + NunitoSansLightEot + '\') format(\'embedded-opentype\')'
]
},
{
fontFamily: 'Nunito Sans',
fontWeight: '400',
src: [
'url(\'' + NunitoSansRegular2 + '\') format(\'woff2\')',
'url(\'' + NunitoSansRegular + '\') format(\'woff\')',
'url(\'' + NunitoSansRegularTtf + '\') format(\'truetype\')',
'url(\'' + NunitoSansRegularEot + '\') format(\'embedded-opentype\')'
]
},
{
fontFamily: 'Nunito Sans',
fontWeight: '600',
src: [
'url(\'' + NunitoSansBold2 + '\') format(\'woff2\')',
'url(\'' + NunitoSansBold + '\') format(\'woff\')',
'url(\'' + NunitoSansBoldTtf + '\') format(\'truetype\')',
'url(\'' + NunitoSansBoldEot + '\') format(\'embedded-opentype\')'
]
}],
// Every texts are disabled if no color specified
root: {
color: theme.palette.text.disabled
Expand Down