Skip to content

Commit dcf9144

Browse files
committed
feat(fonts): add licensed ms_sans_serif font
1 parent e69dc98 commit dcf9144

28 files changed

+86
-13797
lines changed

.storybook/decorators/globalStyle.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ import React from 'react';
22
import { createGlobalStyle } from 'styled-components';
33

44
import styleReset from '../../src/common/styleReset';
5-
import MSSansSerif from '../../src/assets/fonts/MS-Sans-Serif.woff2';
6-
import MSSansSerifBold from '../../src/assets/fonts/MS-Sans-Serif-Bold.woff2';
5+
// TODO is there a way to keep import paths consistent with what end user will get?
6+
import ms_sans_serif from '../../src/assets/fonts/dist/ms_sans_serif.woff2';
7+
import ms_sans_serif_bold from '../../src/assets/fonts/dist/ms_sans_serif_bold.woff2';
78

89
const GlobalStyle = createGlobalStyle`
910
${styleReset}
1011
@font-face {
11-
font-family: 'MS-Sans-Serif';
12-
src: url('${MSSansSerif}') format('woff2');
12+
font-family: 'ms_sans_serif';
13+
src: url('${ms_sans_serif}') format('woff2');
1314
font-weight: 400;
1415
font-style: normal
1516
}
1617
@font-face {
17-
font-family: 'MS-Sans-Serif';
18-
src: url('${MSSansSerifBold}') format("woff2");
18+
font-family: 'ms_sans_serif';
19+
src: url('${ms_sans_serif_bold}') format("woff2");
1920
font-weight: bold;
2021
font-style: normal
2122
}
2223
body {
23-
font-family: 'MS-Sans-Serif', 'sans-serif';
24+
font-family: 'ms_sans_serif', 'sans-serif';
2425
}
2526
`;
2627

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,24 @@ import { styleReset, List, ListItem, Divider } from 'react95';
4949
// pick a theme of your choice
5050
import original from "react95/dist/themes/original";
5151
// original Windows95 font (optionally)
52-
import MSSansSerif from "react95/dist/fonts/MS-Sans-Serif.woff2";
53-
import MSSansSerifBold from "react95/dist/fonts/MS-Sans-Serif-Bold.woff2";
54-
52+
import ms_sans_serif from "react95/dist/fonts/ms_sans_serif.woff2";
53+
import ms_sans_serif_bold from "react95/dist/fonts/ms_sans_serif_bold.woff2";
5554

5655
const GlobalStyles = createGlobalStyle`
5756
@font-face {
58-
font-family: 'MS-Sans-Serif';
59-
src: url('${MSSansSerif}') format('woff2');
57+
font-family: 'ms_sans_serif';
58+
src: url('${ms_sans_serif}') format('woff2');
6059
font-weight: 400;
6160
font-style: normal
6261
}
6362
@font-face {
64-
font-family: 'MS-Sans-Serif';
65-
src: url('${MSSansSerifBold}') format("woff2");
63+
font-family: 'ms_sans_serif';
64+
src: url('${ms_sans_serif_bold}') format('woff2');
6665
font-weight: bold;
6766
font-style: normal
6867
}
6968
body {
70-
font-family: "MS-Sans-Serif";
69+
font-family: 'ms_sans_serif';
7170
}
7271
${styleReset}
7372
`;

docs/usage.mdx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ import { styleReset, List, ListItem, Divider } from 'react95';
1616
// pick a theme of your choice
1717
import original from "react95/dist/themes/original";
1818
// original Windows95 font (optionally)
19-
import MSSansSerif from "react95/dist/fonts/MS-Sans-Serif.woff2";
20-
import MSSansSerifBold from "react95/dist/fonts/MS-Sans-Serif-Bold.woff2";
19+
import ms_sans_serif from "react95/dist/fonts/ms_sans_serif.woff2";
20+
import ms_sans_serif_bold from "react95/dist/fonts/ms_sans_serif_bold.woff2";
2121

2222
const GlobalStyles = createGlobalStyle`
2323
@font-face {
24-
font-family: 'MS-Sans-Serif';
25-
src: url('${MSSansSerif}') format('woff2');
24+
font-family: 'ms_sans_serif';
25+
src: url('${ms_sans_serif}') format('woff2');
2626
font-weight: 400;
2727
font-style: normal
2828
}
2929
@font-face {
30-
font-family: 'MS-Sans-Serif';
31-
src: url('${MSSansSerifBold}') format("woff2");
30+
font-family: 'ms_sans_serif';
31+
src: url('${ms_sans_serif_bold}') format('woff2');
3232
font-weight: bold;
3333
font-style: normal
3434
}
3535
body {
36-
font-family: "MS-Sans-Serif";
36+
font-family: 'ms_sans_serif';
3737
}
3838
${styleReset}
3939
`;

rollup.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ export default [
4444
preserveModules: true,
4545
plugins: [
4646
copy({
47-
targets: [{ src: './src/assets/*', dest: './dist/' }]
47+
targets: [
48+
{ src: './src/assets/fonts/dist/*', dest: './dist/fonts' },
49+
{ src: './src/assets/images/*', dest: './dist/images' }
50+
]
4851
}),
4952
replace({
5053
'process.env.NODE_ENV': JSON.stringify(NODE_ENV)

src/assets/fonts/Digital-Clock.eot

-3.91 KB
Binary file not shown.

src/assets/fonts/Digital-Clock.ttf

-3.68 KB
Binary file not shown.

src/assets/fonts/Digital-Clock.woff

-1.81 KB
Binary file not shown.

src/assets/fonts/Digital-Clock.woff2

-1.18 KB
Binary file not shown.

src/assets/fonts/MS-Sans-Serif.eot

-10.9 KB
Binary file not shown.

src/assets/fonts/MS-Sans-Serif.svg

Lines changed: 0 additions & 230 deletions
This file was deleted.

0 commit comments

Comments
 (0)