diff --git a/.gitignore b/.gitignore index ca6a504..087ff5c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules/ public/*.js public/*.map +public/assets/ diff --git a/src/assets/fonts/Noto/NotoMono-Regular.eot b/src/assets/fonts/Noto/NotoMono-Regular.eot new file mode 100644 index 0000000..4892edf Binary files /dev/null and b/src/assets/fonts/Noto/NotoMono-Regular.eot differ diff --git a/src/assets/fonts/Noto/NotoMono-Regular.otf b/src/assets/fonts/Noto/NotoMono-Regular.otf new file mode 100644 index 0000000..0bc1113 Binary files /dev/null and b/src/assets/fonts/Noto/NotoMono-Regular.otf differ diff --git a/src/assets/fonts/Noto/NotoMono-Regular.ttf b/src/assets/fonts/Noto/NotoMono-Regular.ttf new file mode 100644 index 0000000..3560a3a Binary files /dev/null and b/src/assets/fonts/Noto/NotoMono-Regular.ttf differ diff --git a/src/assets/fonts/Noto/NotoMono-Regular.woff b/src/assets/fonts/Noto/NotoMono-Regular.woff new file mode 100644 index 0000000..d0b28a4 Binary files /dev/null and b/src/assets/fonts/Noto/NotoMono-Regular.woff differ diff --git a/src/assets/fonts/Noto/NotoMono-Regular.woff2 b/src/assets/fonts/Noto/NotoMono-Regular.woff2 new file mode 100644 index 0000000..52e5725 Binary files /dev/null and b/src/assets/fonts/Noto/NotoMono-Regular.woff2 differ diff --git a/src/assets/fonts/Noto/NotoSans-Bold.eot b/src/assets/fonts/Noto/NotoSans-Bold.eot new file mode 100644 index 0000000..4f66b0c Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Bold.eot differ diff --git a/src/assets/fonts/Noto/NotoSans-Bold.otf b/src/assets/fonts/Noto/NotoSans-Bold.otf new file mode 100644 index 0000000..cf30cf6 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Bold.otf differ diff --git a/src/assets/fonts/Noto/NotoSans-Bold.ttf b/src/assets/fonts/Noto/NotoSans-Bold.ttf new file mode 100644 index 0000000..21dddde Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Bold.ttf differ diff --git a/src/assets/fonts/Noto/NotoSans-Bold.woff b/src/assets/fonts/Noto/NotoSans-Bold.woff new file mode 100644 index 0000000..18f887c Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Bold.woff differ diff --git a/src/assets/fonts/Noto/NotoSans-Bold.woff2 b/src/assets/fonts/Noto/NotoSans-Bold.woff2 new file mode 100644 index 0000000..00066cc Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Bold.woff2 differ diff --git a/src/assets/fonts/Noto/NotoSans-BoldItalic.eot b/src/assets/fonts/Noto/NotoSans-BoldItalic.eot new file mode 100644 index 0000000..5367c27 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-BoldItalic.eot differ diff --git a/src/assets/fonts/Noto/NotoSans-BoldItalic.otf b/src/assets/fonts/Noto/NotoSans-BoldItalic.otf new file mode 100644 index 0000000..98b93cc Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-BoldItalic.otf differ diff --git a/src/assets/fonts/Noto/NotoSans-BoldItalic.ttf b/src/assets/fonts/Noto/NotoSans-BoldItalic.ttf new file mode 100644 index 0000000..e46b4cf Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-BoldItalic.ttf differ diff --git a/src/assets/fonts/Noto/NotoSans-BoldItalic.woff b/src/assets/fonts/Noto/NotoSans-BoldItalic.woff new file mode 100644 index 0000000..6c07f20 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-BoldItalic.woff differ diff --git a/src/assets/fonts/Noto/NotoSans-BoldItalic.woff2 b/src/assets/fonts/Noto/NotoSans-BoldItalic.woff2 new file mode 100644 index 0000000..16ffba3 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-BoldItalic.woff2 differ diff --git a/src/assets/fonts/Noto/NotoSans-Italic.eot b/src/assets/fonts/Noto/NotoSans-Italic.eot new file mode 100644 index 0000000..7076788 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Italic.eot differ diff --git a/src/assets/fonts/Noto/NotoSans-Italic.otf b/src/assets/fonts/Noto/NotoSans-Italic.otf new file mode 100644 index 0000000..05ee657 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Italic.otf differ diff --git a/src/assets/fonts/Noto/NotoSans-Italic.ttf b/src/assets/fonts/Noto/NotoSans-Italic.ttf new file mode 100644 index 0000000..dfcd045 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Italic.ttf differ diff --git a/src/assets/fonts/Noto/NotoSans-Italic.woff b/src/assets/fonts/Noto/NotoSans-Italic.woff new file mode 100644 index 0000000..7918cb6 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Italic.woff differ diff --git a/src/assets/fonts/Noto/NotoSans-Italic.woff2 b/src/assets/fonts/Noto/NotoSans-Italic.woff2 new file mode 100644 index 0000000..f894590 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Italic.woff2 differ diff --git a/src/assets/fonts/Noto/NotoSans-Regular.eot b/src/assets/fonts/Noto/NotoSans-Regular.eot new file mode 100644 index 0000000..5203e89 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Regular.eot differ diff --git a/src/assets/fonts/Noto/NotoSans-Regular.otf b/src/assets/fonts/Noto/NotoSans-Regular.otf new file mode 100644 index 0000000..570b823 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Regular.otf differ diff --git a/src/assets/fonts/Noto/NotoSans-Regular.ttf b/src/assets/fonts/Noto/NotoSans-Regular.ttf new file mode 100644 index 0000000..04be6f5 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Regular.ttf differ diff --git a/src/assets/fonts/Noto/NotoSans-Regular.woff b/src/assets/fonts/Noto/NotoSans-Regular.woff new file mode 100644 index 0000000..e30e58e Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Regular.woff differ diff --git a/src/assets/fonts/Noto/NotoSans-Regular.woff2 b/src/assets/fonts/Noto/NotoSans-Regular.woff2 new file mode 100644 index 0000000..7760989 Binary files /dev/null and b/src/assets/fonts/Noto/NotoSans-Regular.woff2 differ diff --git a/src/assets/fonts/fonts.scss b/src/assets/fonts/fonts.scss new file mode 100644 index 0000000..2f14c2a --- /dev/null +++ b/src/assets/fonts/fonts.scss @@ -0,0 +1,59 @@ +@font-face { + font-family: 'Noto Sans'; + src: url('./Noto/NotoSans-Regular.eot'); + src: url('./Noto/NotoSans-Regular.eot?#iefix') format('embedded-opentype'), + url('./Noto/NotoSans-Regular.woff2') format('woff2'), + url('./Noto/NotoSans-Regular.woff') format('woff'), + url('./Noto/NotoSans-Regular.ttf') format('truetype'), + url('./Noto/NotoSans-Regular.otf') format('opentype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('./Noto/NotoSans-Bold.eot'); + src: url('./Noto/NotoSans-Bold.eot?#iefix') format('embedded-opentype'), + url('./Noto/NotoSans-Bold.woff2') format('woff2'), + url('./Noto/NotoSans-Bold.woff') format('woff'), + url('./Noto/NotoSans-Bold.ttf') format('truetype'), + url('./Noto/NotoSans-Bold.otf') format('opentype'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('./Noto/NotoSans-BoldItalic.eot'); + src: url('./Noto/NotoSans-BoldItalic.eot?#iefix') format('embedded-opentype'), + url('./Noto/NotoSans-BoldItalic.woff2') format('woff2'), + url('./Noto/NotoSans-BoldItalic.woff') format('woff'), + url('./Noto/NotoSans-BoldItalic.ttf') format('truetype'), + url('./Noto/NotoSans-BoldItalic.otf') format('opentype'); + font-weight: bold; + font-style: italic; +} + +@font-face { + font-family: 'Noto Sans'; + src: url('./Noto/NotoSans-Italic.eot'); + src: url('./Noto/NotoSans-Italic.eot?#iefix') format('embedded-opentype'), + url('./Noto/NotoSans-Italic.woff2') format('woff2'), + url('./Noto/NotoSans-Italic.woff') format('woff'), + url('./Noto/NotoSans-Italic.ttf') format('truetype'), + url('./Noto/NotoSans-Italic.otf') format('opentype'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Noto Mono'; + src: url('./Noto/NotoMono-Regular.eot'); + src: url('./Noto/NotoMono-Regular.eot?#iefix') format('embedded-opentype'), + url('./Noto/NotoMono-Regular.woff2') format('woff2'), + url('./Noto/NotoMono-Regular.woff') format('woff'), + url('./Noto/NotoMono-Regular.ttf') format('truetype'), + url('./Noto/NotoMono-Regular.otf') format('opentype'); + font-weight: normal; + font-style: normal; +} diff --git a/src/index.jsx b/src/index.jsx index 8abd171..c97955a 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,3 +1,4 @@ +import './assets/fonts/fonts.scss'; import './sass/main.scss'; import Inferno from 'inferno'; diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss index c9dfbfb..5776632 100644 --- a/src/sass/_variables.scss +++ b/src/sass/_variables.scss @@ -26,8 +26,8 @@ $purple: hsl(271, 100%, 71%); $red: hsl(348, 100%, 61%); // Typography -$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif; -$family-monospace: monospace; +$family-sans-serif: "Noto Sans", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif; +$family-monospace: "Noto Mono", monospace; $size-1: 3rem; $size-2: 2.5rem; diff --git a/webpack.config.js b/webpack.config.js index 63cfa1a..c750842 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -53,6 +53,62 @@ const webpackConfig = { } ] } + , { + test: (/\.woff$/) + , exclude: (/node_modules/) + , use: [ + { + loader: 'url-loader' + , options: { + limit: 65000 + , mimetype: 'application/font-woff' + , name: './assets/fonts/[name].[ext]' + } + } + ] + } + , { + test: (/\.woff2$/) + , exclude: (/node_modules/) + , use: [ + { + loader: 'url-loader' + , options: { + limit: 65000 + , mimetype: 'application/font-woff2' + , name: './assets/fonts/[name].[ext]' + } + } + ] + } + , { + test: (/\.[ot]tf$/) + , exclude: (/node_modules/) + , use: [ + { + loader: 'url-loader' + , options: { + limit: 65000 + , mimetype: 'application/octet-stream' + , name: './assets/fonts/[name].[ext]' + } + } + ] + } + , { + test: (/\.eot$/) + , exclude: (/node_modules/) + , use: [ + { + loader: 'url-loader' + , options: { + limit: 65000 + , mimetype: 'application/vnd.ms-fontobject' + , name: './assets/fonts/[name].[ext]' + } + } + ] + } ] } , resolve: {