diff --git a/client/config/webpack.config.dev.js b/client/config/webpack.config.dev.js index c933631c..4abdfdf9 100644 --- a/client/config/webpack.config.dev.js +++ b/client/config/webpack.config.dev.js @@ -74,7 +74,7 @@ module.exports = { options: {mode: ['react-component']}, }, { - test: [/\.eot$/, /\.ttf$/, /\.woff$/, /\.woff2$/], + test: [/\.woff2$/], loader: require.resolve('file-loader'), options: { name: 'static/media/[name].[hash:8].[ext]', diff --git a/client/config/webpack.config.prod.js b/client/config/webpack.config.prod.js index f92c1560..167e4063 100644 --- a/client/config/webpack.config.prod.js +++ b/client/config/webpack.config.prod.js @@ -80,7 +80,7 @@ module.exports = { options: {mode: ['react-component']}, }, { - test: [/\.eot$/, /\.ttf$/, /\.woff$/, /\.woff2$/], + test: [/\.woff2$/], loader: require.resolve('file-loader'), options: { name: 'static/media/[name].[hash:8].[ext]', diff --git a/client/src/fonts/Roboto-500/Roboto-500.eot b/client/src/fonts/Roboto-500/Roboto-500.eot deleted file mode 100755 index 8c06caa2..00000000 Binary files a/client/src/fonts/Roboto-500/Roboto-500.eot and /dev/null differ diff --git a/client/src/fonts/Roboto-500/Roboto-500.svg b/client/src/fonts/Roboto-500/Roboto-500.svg deleted file mode 100755 index 2b989161..00000000 --- a/client/src/fonts/Roboto-500/Roboto-500.svg +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/src/fonts/Roboto-500/Roboto-500.ttf b/client/src/fonts/Roboto-500/Roboto-500.ttf deleted file mode 100755 index 8d6fa924..00000000 Binary files a/client/src/fonts/Roboto-500/Roboto-500.ttf and /dev/null differ diff --git a/client/src/fonts/Roboto-500/Roboto-500.woff b/client/src/fonts/Roboto-500/Roboto-500.woff deleted file mode 100755 index d3c82e18..00000000 Binary files a/client/src/fonts/Roboto-500/Roboto-500.woff and /dev/null differ diff --git a/client/src/fonts/Roboto-700/Roboto-700.eot b/client/src/fonts/Roboto-700/Roboto-700.eot deleted file mode 100755 index f89cad7b..00000000 Binary files a/client/src/fonts/Roboto-700/Roboto-700.eot and /dev/null differ diff --git a/client/src/fonts/Roboto-700/Roboto-700.svg b/client/src/fonts/Roboto-700/Roboto-700.svg deleted file mode 100755 index fc8d42f9..00000000 --- a/client/src/fonts/Roboto-700/Roboto-700.svg +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/src/fonts/Roboto-700/Roboto-700.ttf b/client/src/fonts/Roboto-700/Roboto-700.ttf deleted file mode 100755 index 19090afb..00000000 Binary files a/client/src/fonts/Roboto-700/Roboto-700.ttf and /dev/null differ diff --git a/client/src/fonts/Roboto-700/Roboto-700.woff b/client/src/fonts/Roboto-700/Roboto-700.woff deleted file mode 100755 index 3143de29..00000000 Binary files a/client/src/fonts/Roboto-700/Roboto-700.woff and /dev/null differ diff --git a/client/src/fonts/Roboto-700italic/Roboto-700italic.eot b/client/src/fonts/Roboto-700italic/Roboto-700italic.eot deleted file mode 100755 index b8bbdf22..00000000 Binary files a/client/src/fonts/Roboto-700italic/Roboto-700italic.eot and /dev/null differ diff --git a/client/src/fonts/Roboto-700italic/Roboto-700italic.svg b/client/src/fonts/Roboto-700italic/Roboto-700italic.svg deleted file mode 100755 index c71c29ec..00000000 --- a/client/src/fonts/Roboto-700italic/Roboto-700italic.svg +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/src/fonts/Roboto-700italic/Roboto-700italic.ttf b/client/src/fonts/Roboto-700italic/Roboto-700italic.ttf deleted file mode 100755 index a20e3889..00000000 Binary files a/client/src/fonts/Roboto-700italic/Roboto-700italic.ttf and /dev/null differ diff --git a/client/src/fonts/Roboto-700italic/Roboto-700italic.woff b/client/src/fonts/Roboto-700italic/Roboto-700italic.woff deleted file mode 100755 index 7a0ae05e..00000000 Binary files a/client/src/fonts/Roboto-700italic/Roboto-700italic.woff and /dev/null differ diff --git a/client/src/fonts/Roboto-italic/Roboto-italic.eot b/client/src/fonts/Roboto-italic/Roboto-italic.eot deleted file mode 100755 index f2d020a8..00000000 Binary files a/client/src/fonts/Roboto-italic/Roboto-italic.eot and /dev/null differ diff --git a/client/src/fonts/Roboto-italic/Roboto-italic.svg b/client/src/fonts/Roboto-italic/Roboto-italic.svg deleted file mode 100755 index 738b8295..00000000 --- a/client/src/fonts/Roboto-italic/Roboto-italic.svg +++ /dev/null @@ -1,323 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/src/fonts/Roboto-italic/Roboto-italic.ttf b/client/src/fonts/Roboto-italic/Roboto-italic.ttf deleted file mode 100755 index b0dd4a1e..00000000 Binary files a/client/src/fonts/Roboto-italic/Roboto-italic.ttf and /dev/null differ diff --git a/client/src/fonts/Roboto-italic/Roboto-italic.woff b/client/src/fonts/Roboto-italic/Roboto-italic.woff deleted file mode 100755 index dcfeb008..00000000 Binary files a/client/src/fonts/Roboto-italic/Roboto-italic.woff and /dev/null differ diff --git a/client/src/fonts/Roboto-regular/Roboto-regular.eot b/client/src/fonts/Roboto-regular/Roboto-regular.eot deleted file mode 100755 index d26bc8f5..00000000 Binary files a/client/src/fonts/Roboto-regular/Roboto-regular.eot and /dev/null differ diff --git a/client/src/fonts/Roboto-regular/Roboto-regular.svg b/client/src/fonts/Roboto-regular/Roboto-regular.svg deleted file mode 100755 index ed55c105..00000000 --- a/client/src/fonts/Roboto-regular/Roboto-regular.svg +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/src/fonts/Roboto-regular/Roboto-regular.ttf b/client/src/fonts/Roboto-regular/Roboto-regular.ttf deleted file mode 100755 index 7b25f3ce..00000000 Binary files a/client/src/fonts/Roboto-regular/Roboto-regular.ttf and /dev/null differ diff --git a/client/src/fonts/Roboto-regular/Roboto-regular.woff b/client/src/fonts/Roboto-regular/Roboto-regular.woff deleted file mode 100755 index 5e353cf4..00000000 Binary files a/client/src/fonts/Roboto-regular/Roboto-regular.woff and /dev/null differ diff --git a/client/src/sass/base/_font-families.scss b/client/src/sass/base/_font-families.scss index dcdd0426..4039cb09 100644 --- a/client/src/sass/base/_font-families.scss +++ b/client/src/sass/base/_font-families.scss @@ -2,59 +2,33 @@ font-family: 'Roboto'; font-weight: 400; font-style: normal; - src: url('../fonts/Roboto-regular/Roboto-regular.eot'); - src: url('../fonts/Roboto-regular/Roboto-regular.eot?#iefix') format('embedded-opentype'), local('Roboto'), - local('Roboto-regular'), url('../fonts/Roboto-regular/Roboto-regular.woff2') format('woff2'), - url('../fonts/Roboto-regular/Roboto-regular.woff') format('woff'), - url('../fonts/Roboto-regular/Roboto-regular.ttf') format('truetype'), - url('../fonts/Roboto-regular/Roboto-regular.svg#Roboto') format('svg'); + src: local('Roboto-regular'), url('../fonts/Roboto-regular/Roboto-regular.woff2') format('woff2'); } @font-face { font-family: 'Roboto'; font-weight: 500; font-style: normal; - src: url('../fonts/Roboto-500/Roboto-500.eot'); - src: url('../fonts/Roboto-500/Roboto-500.eot?#iefix') format('embedded-opentype'), local('Roboto Medium'), - local('Roboto-500'), url('../fonts/Roboto-500/Roboto-500.woff2') format('woff2'), - url('../fonts/Roboto-500/Roboto-500.woff') format('woff'), - url('../fonts/Roboto-500/Roboto-500.ttf') format('truetype'), - url('../fonts/Roboto-500/Roboto-500.svg#Roboto') format('svg'); + src: local('Roboto-500'), url('../fonts/Roboto-500/Roboto-500.woff2') format('woff2'); } @font-face { font-family: 'Roboto'; font-weight: 700; font-style: normal; - src: url('../fonts/Roboto-700/Roboto-700.eot'); - src: url('../fonts/Roboto-700/Roboto-700.eot?#iefix') format('embedded-opentype'), local('Roboto Bold'), - local('Roboto-700'), url('../fonts/Roboto-700/Roboto-700.woff2') format('woff2'), - url('../fonts/Roboto-700/Roboto-700.woff') format('woff'), - url('../fonts/Roboto-700/Roboto-700.ttf') format('truetype'), - url('../fonts/Roboto-700/Roboto-700.svg#Roboto') format('svg'); + src: local('Roboto-700'), url('../fonts/Roboto-700/Roboto-700.woff2') format('woff2'); } @font-face { font-family: 'Roboto'; font-weight: 400; font-style: italic; - src: url('../fonts/Roboto-italic/Roboto-italic.eot'); - src: url('../fonts/Roboto-italic/Roboto-italic.eot?#iefix') format('embedded-opentype'), local('Roboto Italic'), - local('Roboto-italic'), url('../fonts/Roboto-italic/Roboto-italic.woff2') format('woff2'), - url('../fonts/Roboto-italic/Roboto-italic.woff') format('woff'), - url('../fonts/Roboto-italic/Roboto-italic.ttf') format('truetype'), - url('../fonts/Roboto-italic/Roboto-italic.svg#Roboto') format('svg'); + src: local('Roboto-italic'), url('../fonts/Roboto-italic/Roboto-italic.woff2') format('woff2'); } @font-face { font-family: 'Roboto'; font-weight: 700; font-style: italic; - src: url('../fonts/Roboto-700italic/Roboto-700italic.eot'); - src: url('../fonts/Roboto-700italic/Roboto-700italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Bold Italic'), local('Roboto-700italic'), - url('../fonts/Roboto-700italic/Roboto-700italic.woff2') format('woff2'), - url('../fonts/Roboto-700italic/Roboto-700italic.woff') format('woff'), - url('../fonts/Roboto-700italic/Roboto-700italic.ttf') format('truetype'), - url('../fonts/Roboto-700italic/Roboto-700italic.svg#Roboto') format('svg'); + src: local('Roboto Bold Italic'), url('../fonts/Roboto-700italic/Roboto-700italic.woff2') format('woff2'); }