diff --git a/frontend/fonts b/frontend/fonts deleted file mode 120000 index 3af17ecb..00000000 --- a/frontend/fonts +++ /dev/null @@ -1 +0,0 @@ -./node_modules/tabler-ui/dist/assets/fonts \ No newline at end of file diff --git a/frontend/fonts/feather b/frontend/fonts/feather new file mode 120000 index 00000000..440203ba --- /dev/null +++ b/frontend/fonts/feather @@ -0,0 +1 @@ +../node_modules/tabler-ui/dist/assets/fonts/feather \ No newline at end of file diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff new file mode 100644 index 00000000..96d8768e Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2 b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2 new file mode 100644 index 00000000..e97a2218 Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2 differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff new file mode 100644 index 00000000..0829caef Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2 b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2 new file mode 100644 index 00000000..7c901cd8 Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2 differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff new file mode 100644 index 00000000..99652481 Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2 b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2 new file mode 100644 index 00000000..343e5ba8 Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2 differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff new file mode 100644 index 00000000..92c3260e Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2 b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2 new file mode 100644 index 00000000..d552543b Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2 differ diff --git a/frontend/html/partials/header.ejs b/frontend/html/partials/header.ejs index 3e1f657c..b8d88331 100644 --- a/frontend/html/partials/header.ejs +++ b/frontend/html/partials/header.ejs @@ -20,7 +20,6 @@ - diff --git a/frontend/scss/fonts.scss b/frontend/scss/fonts.scss new file mode 100644 index 00000000..f0ec1b73 --- /dev/null +++ b/frontend/scss/fonts.scss @@ -0,0 +1,39 @@ +/* source-sans-pro-regular - latin-ext_latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + src: local(''), + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* source-sans-pro-italic - latin-ext_latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: italic; + font-weight: 400; + src: local(''), + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* source-sans-pro-700italic - latin-ext_latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: italic; + font-weight: 700; + src: local(''), + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* source-sans-pro-700 - latin-ext_latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 700; + src: local(''), + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} diff --git a/frontend/scss/styles.scss b/frontend/scss/styles.scss index 16b329c7..52733097 100644 --- a/frontend/scss/styles.scss +++ b/frontend/scss/styles.scss @@ -1,5 +1,6 @@ @import "~tabler-ui/dist/assets/css/dashboard"; @import "tabler-extra"; +@import "fonts"; @import "selectize"; @import "custom"; diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index 8b911dc1..df0f1c14 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -90,7 +90,19 @@ module.exports = { } } ] - } + }, + { + test: /source-sans-pro.*\.(woff(2)?)(\?v=\d+\.\d+\.\d+)?$/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[ext]', + outputPath: 'assets/' + } + } + ] + } ] }, plugins: [