feat(fonts): add licensed ms_sans_serif font

react95-io · Jul 17, 2020 · dcf9144 · dcf9144
1 parent e69dc98
commit dcf9144
Show file tree

Hide file tree

Showing 28 changed files with 86 additions and 13,797 deletions.
diff --git a/.storybook/decorators/globalStyle.js b/.storybook/decorators/globalStyle.js
@@ -2,25 +2,26 @@ import React from 'react';
 import { createGlobalStyle } from 'styled-components';
 
 import styleReset from '../../src/common/styleReset';
-import MSSansSerif from '../../src/assets/fonts/MS-Sans-Serif.woff2';
-import MSSansSerifBold from '../../src/assets/fonts/MS-Sans-Serif-Bold.woff2';
+// TODO is there a way to keep import paths consistent with what end user will get?
+import ms_sans_serif from '../../src/assets/fonts/dist/ms_sans_serif.woff2';
+import ms_sans_serif_bold from '../../src/assets/fonts/dist/ms_sans_serif_bold.woff2';
 
 const GlobalStyle = createGlobalStyle`
   ${styleReset}
   @font-face {
-    font-family: 'MS-Sans-Serif';
-    src: url('${MSSansSerif}') format('woff2');
+    font-family: 'ms_sans_serif';
+    src: url('${ms_sans_serif}') format('woff2');
     font-weight: 400;
     font-style: normal
   }
   @font-face {
-    font-family: 'MS-Sans-Serif';
-    src: url('${MSSansSerifBold}') format("woff2");
+    font-family: 'ms_sans_serif';
+    src: url('${ms_sans_serif_bold}') format("woff2");
     font-weight: bold;
     font-style: normal
   }
   body {
-    font-family: 'MS-Sans-Serif', 'sans-serif';
+    font-family: 'ms_sans_serif', 'sans-serif';
   }
 `;
 

diff --git a/README.md b/README.md
@@ -49,25 +49,24 @@ import { styleReset, List, ListItem, Divider } from 'react95';
 // pick a theme of your choice
 import original from "react95/dist/themes/original";
 // original Windows95 font (optionally)
-import MSSansSerif from "react95/dist/fonts/MS-Sans-Serif.woff2";
-import MSSansSerifBold from "react95/dist/fonts/MS-Sans-Serif-Bold.woff2";
-
+import ms_sans_serif from "react95/dist/fonts/ms_sans_serif.woff2";
+import ms_sans_serif_bold from "react95/dist/fonts/ms_sans_serif_bold.woff2";
 
 const GlobalStyles = createGlobalStyle`
   @font-face {
-    font-family: 'MS-Sans-Serif';
-    src: url('${MSSansSerif}') format('woff2');
+    font-family: 'ms_sans_serif';
+    src: url('${ms_sans_serif}') format('woff2');
     font-weight: 400;
     font-style: normal
   }
   @font-face {
-    font-family: 'MS-Sans-Serif';
-    src: url('${MSSansSerifBold}') format("woff2");
+    font-family: 'ms_sans_serif';
+    src: url('${ms_sans_serif_bold}') format('woff2');
     font-weight: bold;
     font-style: normal
   }
   body {
-    font-family: "MS-Sans-Serif";
+    font-family: 'ms_sans_serif';
   }
   ${styleReset}
 `;

diff --git a/docs/usage.mdx b/docs/usage.mdx
@@ -16,24 +16,24 @@ import { styleReset, List, ListItem, Divider } from 'react95';
 // pick a theme of your choice
 import original from "react95/dist/themes/original";
 // original Windows95 font (optionally)
-import MSSansSerif from "react95/dist/fonts/MS-Sans-Serif.woff2";
-import MSSansSerifBold from "react95/dist/fonts/MS-Sans-Serif-Bold.woff2";
+import ms_sans_serif from "react95/dist/fonts/ms_sans_serif.woff2";
+import ms_sans_serif_bold from "react95/dist/fonts/ms_sans_serif_bold.woff2";
 
 const GlobalStyles = createGlobalStyle`
   @font-face {
-    font-family: 'MS-Sans-Serif';
-    src: url('${MSSansSerif}') format('woff2');
+    font-family: 'ms_sans_serif';
+    src: url('${ms_sans_serif}') format('woff2');
     font-weight: 400;
     font-style: normal
   }
   @font-face {
-    font-family: 'MS-Sans-Serif';
-    src: url('${MSSansSerifBold}') format("woff2");
+    font-family: 'ms_sans_serif';
+    src: url('${ms_sans_serif_bold}') format('woff2');
     font-weight: bold;
     font-style: normal
   }
   body {
-    font-family: "MS-Sans-Serif";
+    font-family: 'ms_sans_serif';
   }
   ${styleReset}
 `;

diff --git a/rollup.config.js b/rollup.config.js
@@ -44,7 +44,10 @@ export default [
     preserveModules: true,
     plugins: [
       copy({
-        targets: [{ src: './src/assets/*', dest: './dist/' }]
+        targets: [
+          { src: './src/assets/fonts/dist/*', dest: './dist/fonts' },
+          { src: './src/assets/images/*', dest: './dist/images' }
+        ]
       }),
       replace({
         'process.env.NODE_ENV': JSON.stringify(NODE_ENV)

diff --git a/src/assets/fonts/Digital-Clock.eot b/src/assets/fonts/Digital-Clock.eot
diff --git a/src/assets/fonts/Digital-Clock.ttf b/src/assets/fonts/Digital-Clock.ttf
diff --git a/src/assets/fonts/Digital-Clock.woff b/src/assets/fonts/Digital-Clock.woff
diff --git a/src/assets/fonts/Digital-Clock.woff2 b/src/assets/fonts/Digital-Clock.woff2
diff --git a/src/assets/fonts/MS-Sans-Serif.eot b/src/assets/fonts/MS-Sans-Serif.eot
diff --git a/src/assets/fonts/MS-Sans-Serif.svg b/src/assets/fonts/MS-Sans-Serif.svg
diff --git a/src/assets/fonts/MS-Sans-Serif.woff b/src/assets/fonts/MS-Sans-Serif.woff
diff --git a/src/assets/fonts/MS-Sans-Serif.woff2 b/src/assets/fonts/MS-Sans-Serif.woff2
diff --git a/src/assets/fonts/dist/ms_sans_serif.woff b/src/assets/fonts/dist/ms_sans_serif.woff
diff --git a/src/assets/fonts/dist/ms_sans_serif.woff2 b/src/assets/fonts/dist/ms_sans_serif.woff2
diff --git a/src/assets/fonts/dist/ms_sans_serif_bold.woff b/src/assets/fonts/dist/ms_sans_serif_bold.woff
diff --git a/src/assets/fonts/MS-Sans-Serif-Bold.woff2 → ...ssets/fonts/dist/ms_sans_serif_bold.woff2 b/src/assets/fonts/MS-Sans-Serif-Bold.woff2 → ...ssets/fonts/dist/ms_sans_serif_bold.woff2
diff --git a/src/assets/fonts/px_icons.woff2 b/src/assets/fonts/px_icons.woff2
diff --git a/src/assets/fonts/px_sans_nouveaux.eot b/src/assets/fonts/px_sans_nouveaux.eot
diff --git a/src/assets/fonts/px_sans_nouveaux.svg b/src/assets/fonts/px_sans_nouveaux.svg
diff --git a/src/assets/fonts/px_sans_nouveaux.ttf b/src/assets/fonts/px_sans_nouveaux.ttf
diff --git a/src/assets/fonts/px_sans_nouveaux.woff b/src/assets/fonts/px_sans_nouveaux.woff
diff --git a/src/assets/fonts/px_sans_nouveaux.woff2 b/src/assets/fonts/px_sans_nouveaux.woff2
diff --git a/src/assets/fonts/src/ms-sans-serif-bold/MS Sans Serif Bold.ttf b/src/assets/fonts/src/ms-sans-serif-bold/MS Sans Serif Bold.ttf
diff --git a/src/assets/fonts/src/ms-sans-serif-bold/license.txt b/src/assets/fonts/src/ms-sans-serif-bold/license.txt
@@ -0,0 +1,4 @@
+The FontStruction “MS Sans Serif Bold”
+(https://fontstruct.com/fontstructions/show/1384862) by “lou” is licensed
+under a Creative Commons Attribution Share Alike license
+(http://creativecommons.org/licenses/by-sa/3.0/).
diff --git a/src/assets/fonts/src/ms-sans-serif-bold/readme.txt b/src/assets/fonts/src/ms-sans-serif-bold/readme.txt
@@ -0,0 +1,26 @@
+The font file in this archive was created using Fontstruct the free, online
+font-building tool.
+This font was created by “lou”.
+This font has a homepage where this archive and other versions may be found:
+https://fontstruct.com/fontstructions/show/1384862
+
+Try Fontstruct at http://fontstruct.com
+It’s easy and it’s fun.
+
+NOTE FOR FLASH USERS: Fontstruct fonts (fontstructions) are optimized for Flash.
+If the font in this archive is a pixel font, it is best displayed at a font-size
+of 11.
+
+Fontstruct is sponsored by FontShop.
+Visit them at https://fontshop.com
+FontShop is the original independent font retailer. We’ve been around since
+the dawn of digital type. Whether you need the right font or need to create the
+right font from scratch, let our 26 years of experience work for you.
+
+Fontstruct is copyright ©2017 Rob Meek
+
+LEGAL NOTICE:
+In using this font you must comply with the licensing terms described in the
+file “license.txt” included with this archive.
+If you redistribute the font file in this archive, it must be accompanied by all
+the other files from this archive, including this one.
diff --git a/src/assets/fonts/MS-Sans-Serif.ttf → ...fonts/src/ms-sans-serif/MS Sans Serif.ttf b/src/assets/fonts/MS-Sans-Serif.ttf → ...fonts/src/ms-sans-serif/MS Sans Serif.ttf
diff --git a/src/assets/fonts/src/ms-sans-serif/license.txt b/src/assets/fonts/src/ms-sans-serif/license.txt
@@ -0,0 +1,4 @@
+The FontStruction “MS Sans Serif”
+(https://fontstruct.com/fontstructions/show/1384746) by “lou” is licensed
+under a Creative Commons Attribution Share Alike license
+(http://creativecommons.org/licenses/by-sa/3.0/).
diff --git a/src/assets/fonts/src/ms-sans-serif/readme.txt b/src/assets/fonts/src/ms-sans-serif/readme.txt
@@ -0,0 +1,26 @@
+The font file in this archive was created using Fontstruct the free, online
+font-building tool.
+This font was created by “lou”.
+This font has a homepage where this archive and other versions may be found:
+https://fontstruct.com/fontstructions/show/1384746
+
+Try Fontstruct at http://fontstruct.com
+It’s easy and it’s fun.
+
+NOTE FOR FLASH USERS: Fontstruct fonts (fontstructions) are optimized for Flash.
+If the font in this archive is a pixel font, it is best displayed at a font-size
+of 11.
+
+Fontstruct is sponsored by FontShop.
+Visit them at https://fontshop.com
+FontShop is the original independent font retailer. We’ve been around since
+the dawn of digital type. Whether you need the right font or need to create the
+right font from scratch, let our 26 years of experience work for you.
+
+Fontstruct is copyright ©2017 Rob Meek
+
+LEGAL NOTICE:
+In using this font you must comply with the licensing terms described in the
+file “license.txt” included with this archive.
+If you redistribute the font file in this archive, it must be accompanied by all
+the other files from this archive, including this one.