diff --git a/.gitignore b/.gitignore index ad57d28c1e8..15498c95284 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ npm-debug.log vwd.webinfo css/ dist/ -webfonts/ *.pem *.crx *.zip diff --git a/src/index.html b/src/index.html index c9cce1eda9d..4ed9fe890f2 100644 --- a/src/index.html +++ b/src/index.html @@ -13,9 +13,6 @@ - - diff --git a/src/scss/plugins.scss b/src/scss/plugins.scss index 9c9e598ae31..1b7a306569d 100644 --- a/src/scss/plugins.scss +++ b/src/scss/plugins.scss @@ -1,3 +1,5 @@ +$fa-font-path: "~font-awesome/fonts"; +@import "~font-awesome/scss/font-awesome.scss"; @import "~angular2-toaster/toaster"; #toast-container { diff --git a/src/scss/styles.scss b/src/scss/styles.scss index a61799ffc2f..39a35b9ce3a 100644 --- a/src/scss/styles.scss +++ b/src/scss/styles.scss @@ -1,3 +1,5 @@ +@import "../webfonts/webfonts.css"; + $primary: #3c8dbc; $primary-accent: #286090; $secondary: #ced4da; diff --git a/src/webfonts/Open_Sans-italic-300.woff b/src/webfonts/Open_Sans-italic-300.woff new file mode 100644 index 00000000000..9e3973afe5e Binary files /dev/null and b/src/webfonts/Open_Sans-italic-300.woff differ diff --git a/src/webfonts/Open_Sans-italic-400.woff b/src/webfonts/Open_Sans-italic-400.woff new file mode 100644 index 00000000000..dc1994729da Binary files /dev/null and b/src/webfonts/Open_Sans-italic-400.woff differ diff --git a/src/webfonts/Open_Sans-italic-600.woff b/src/webfonts/Open_Sans-italic-600.woff new file mode 100644 index 00000000000..8155f7884a3 Binary files /dev/null and b/src/webfonts/Open_Sans-italic-600.woff differ diff --git a/src/webfonts/Open_Sans-italic-700.woff b/src/webfonts/Open_Sans-italic-700.woff new file mode 100644 index 00000000000..e9f5264c46b Binary files /dev/null and b/src/webfonts/Open_Sans-italic-700.woff differ diff --git a/src/webfonts/Open_Sans-italic-800.woff b/src/webfonts/Open_Sans-italic-800.woff new file mode 100644 index 00000000000..72227015117 Binary files /dev/null and b/src/webfonts/Open_Sans-italic-800.woff differ diff --git a/src/webfonts/Open_Sans-normal-300.woff b/src/webfonts/Open_Sans-normal-300.woff new file mode 100644 index 00000000000..7f2e53fffdf Binary files /dev/null and b/src/webfonts/Open_Sans-normal-300.woff differ diff --git a/src/webfonts/Open_Sans-normal-400.woff b/src/webfonts/Open_Sans-normal-400.woff new file mode 100644 index 00000000000..a96746c5f47 Binary files /dev/null and b/src/webfonts/Open_Sans-normal-400.woff differ diff --git a/src/webfonts/Open_Sans-normal-600.woff b/src/webfonts/Open_Sans-normal-600.woff new file mode 100644 index 00000000000..b9d98ed23ee Binary files /dev/null and b/src/webfonts/Open_Sans-normal-600.woff differ diff --git a/src/webfonts/Open_Sans-normal-700.woff b/src/webfonts/Open_Sans-normal-700.woff new file mode 100644 index 00000000000..3db398c6e38 Binary files /dev/null and b/src/webfonts/Open_Sans-normal-700.woff differ diff --git a/src/webfonts/Open_Sans-normal-800.woff b/src/webfonts/Open_Sans-normal-800.woff new file mode 100644 index 00000000000..3fd1373c7ca Binary files /dev/null and b/src/webfonts/Open_Sans-normal-800.woff differ diff --git a/src/webfonts/webfonts.css b/src/webfonts/webfonts.css new file mode 100644 index 00000000000..c2f49db4123 --- /dev/null +++ b/src/webfonts/webfonts.css @@ -0,0 +1,79 @@ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: url(Open_Sans-italic-300.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: url(Open_Sans-italic-400.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600; + src: url(Open_Sans-italic-600.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: url(Open_Sans-italic-700.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 800; + src: url(Open_Sans-italic-800.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: url(Open_Sans-normal-300.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url(Open_Sans-normal-400.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: url(Open_Sans-normal-600.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: url(Open_Sans-normal-700.woff) format('woff'); + unicode-range: U+0-10FFFF; +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 800; + src: url(Open_Sans-normal-800.woff) format('woff'); + unicode-range: U+0-10FFFF; +} diff --git a/webpack.config.js b/webpack.config.js index 8e5dd73104f..aed554884f8 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -40,6 +40,17 @@ const moduleRules = [ test: /\.(html)$/, loader: 'html-loader', }, + { + test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/, + exclude: /loading.svg/, + use: [{ + loader: 'file-loader', + options: { + name: '[name].[ext]', + outputPath: 'fonts/', + }, + }], + }, { test: /\.(jpe?g|png|gif|svg)$/i, exclude: /.*(fontawesome-webfont)\.svg/,