diff --git a/package.json b/package.json index 95969a6..89afbd8 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "clean-webpack-plugin": "^0.1.19", "css-loader": "^0.28.11", "exports-loader": "^0.7.0", + "file-loader": "^1.1.11", "html-loader": "^0.5.5", "html-webpack-plugin": "^3.1.0", "jstransformer-markdown-it": "^2.0.0", diff --git a/src/index/index.scss b/src/index/index.scss index fbc85fd..5572cae 100644 --- a/src/index/index.scss +++ b/src/index/index.scss @@ -1,2 +1,2 @@ -@import "../lib/scss/custom-bootstrap"; +@import "../lib/scss/main"; @import "~bootstrap/scss/bootstrap"; diff --git a/src/lib/fonts/nunito-v9-latin-italic.eot b/src/lib/fonts/nunito-v9-latin-italic.eot new file mode 100644 index 0000000..d7eee32 Binary files /dev/null and b/src/lib/fonts/nunito-v9-latin-italic.eot differ diff --git a/src/lib/fonts/nunito-v9-latin-italic.svg b/src/lib/fonts/nunito-v9-latin-italic.svg new file mode 100644 index 0000000..867d10e --- /dev/null +++ b/src/lib/fonts/nunito-v9-latin-italic.svg @@ -0,0 +1,447 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lib/fonts/nunito-v9-latin-italic.ttf b/src/lib/fonts/nunito-v9-latin-italic.ttf new file mode 100644 index 0000000..b5fcd89 Binary files /dev/null and b/src/lib/fonts/nunito-v9-latin-italic.ttf differ diff --git a/src/lib/fonts/nunito-v9-latin-italic.woff b/src/lib/fonts/nunito-v9-latin-italic.woff new file mode 100644 index 0000000..8162f07 Binary files /dev/null and b/src/lib/fonts/nunito-v9-latin-italic.woff differ diff --git a/src/lib/fonts/nunito-v9-latin-italic.woff2 b/src/lib/fonts/nunito-v9-latin-italic.woff2 new file mode 100644 index 0000000..49e699e Binary files /dev/null and b/src/lib/fonts/nunito-v9-latin-italic.woff2 differ diff --git a/src/lib/fonts/nunito-v9-latin-regular.eot b/src/lib/fonts/nunito-v9-latin-regular.eot new file mode 100644 index 0000000..854acdd Binary files /dev/null and b/src/lib/fonts/nunito-v9-latin-regular.eot differ diff --git a/src/lib/fonts/nunito-v9-latin-regular.svg b/src/lib/fonts/nunito-v9-latin-regular.svg new file mode 100644 index 0000000..3998833 --- /dev/null +++ b/src/lib/fonts/nunito-v9-latin-regular.svg @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lib/fonts/nunito-v9-latin-regular.ttf b/src/lib/fonts/nunito-v9-latin-regular.ttf new file mode 100644 index 0000000..c40e599 Binary files /dev/null and b/src/lib/fonts/nunito-v9-latin-regular.ttf differ diff --git a/src/lib/fonts/nunito-v9-latin-regular.woff b/src/lib/fonts/nunito-v9-latin-regular.woff new file mode 100644 index 0000000..0997cc3 Binary files /dev/null and b/src/lib/fonts/nunito-v9-latin-regular.woff differ diff --git a/src/lib/fonts/nunito-v9-latin-regular.woff2 b/src/lib/fonts/nunito-v9-latin-regular.woff2 new file mode 100644 index 0000000..28b65a1 Binary files /dev/null and b/src/lib/fonts/nunito-v9-latin-regular.woff2 differ diff --git a/src/lib/scss/custom-bootstrap.scss b/src/lib/scss/_custom-bootstrap.scss similarity index 85% rename from src/lib/scss/custom-bootstrap.scss rename to src/lib/scss/_custom-bootstrap.scss index 350ad77..e31cf2c 100644 --- a/src/lib/scss/custom-bootstrap.scss +++ b/src/lib/scss/_custom-bootstrap.scss @@ -1,7 +1,6 @@ @import "~bootstrap/scss/functions"; @import "~bootstrap/scss/variables"; @import "~bootstrap/scss/mixins"; -// @import "~nunito-fontface/css/nunito/nunito"; $body-bg: #0f0f0f; $body-color: #dddddd; diff --git a/src/lib/scss/_fonts.scss b/src/lib/scss/_fonts.scss new file mode 100644 index 0000000..a4edc47 --- /dev/null +++ b/src/lib/scss/_fonts.scss @@ -0,0 +1,27 @@ +/* nunito-italic - latin */ +@font-face { + font-family: 'Nunito'; + font-style: italic; + font-weight: 400; + src: url('../lib/fonts/nunito-v9-latin-italic.eot'); /* IE9 Compat Modes */ + src: local('Nunito Italic'), local('Nunito-Italic'), + url('../lib/fonts/nunito-v9-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../lib/fonts/nunito-v9-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('../lib/fonts/nunito-v9-latin-italic.woff') format('woff'), /* Modern Browsers */ + url('../lib/fonts/nunito-v9-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../lib/fonts/nunito-v9-latin-italic.svg#Nunito') format('svg'); /* Legacy iOS */ +} + +/* nunito-regular - latin */ +@font-face { + font-family: 'Nunito'; + font-style: normal; + font-weight: 400; + src: url('../lib/fonts/nunito-v9-latin-regular.eot'); /* IE9 Compat Modes */ + src: local('Nunito Regular'), local('Nunito-Regular'), + url('../lib/fonts/nunito-v9-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../lib/fonts/nunito-v9-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../lib/fonts/nunito-v9-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../lib/fonts/nunito-v9-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../lib/fonts/nunito-v9-latin-regular.svg#Nunito') format('svg'); /* Legacy iOS */ +} diff --git a/src/lib/scss/main.scss b/src/lib/scss/main.scss new file mode 100644 index 0000000..e12f069 --- /dev/null +++ b/src/lib/scss/main.scss @@ -0,0 +1,2 @@ +@import 'custom-bootstrap'; +@import 'fonts'; diff --git a/src/mail/mail.scss b/src/mail/mail.scss index 4c1148a..5572cae 100644 --- a/src/mail/mail.scss +++ b/src/mail/mail.scss @@ -1,2 +1,2 @@ -@import "../lib/scss/custom-bootstrap.scss"; +@import "../lib/scss/main"; @import "~bootstrap/scss/bootstrap"; diff --git a/webpack.common.js b/webpack.common.js index c0cb102..c986c58 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -71,6 +71,12 @@ module.exports = { use: [{ loader: "pug-loader" }] + }, + { + test: /\.(eot|svg|ttf|woff|woff2)$/, + use: [{ + loader: "file-loader" + }] } ] } diff --git a/yarn.lock b/yarn.lock index 772c99d..feedcc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2283,6 +2283,13 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" +file-loader@^1.1.11: + version "1.1.11" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8" + dependencies: + loader-utils "^1.0.2" + schema-utils "^0.4.5" + filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"