Commit 63da4b4b authored by JC Brand's avatar JC Brand

Move webfonts to sass dir and don't make `publicPath` absolute

parent a6b7d0d9
...@@ -2,38 +2,38 @@ ...@@ -2,38 +2,38 @@
font-family: 'Baumans'; font-family: 'Baumans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Baumans Regular'), local('Baumans-Regular'), url('../dist/webfonts/baumans.ttf') format('truetype'); src: local('Baumans Regular'), local('Baumans-Regular'), url('webfonts/baumans.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Muli'; font-family: 'Muli';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Muli Regular'), local('Muli-Regular'), url('../dist/webfonts/muli.ttf') format('truetype'); src: local('Muli Regular'), local('Muli-Regular'), url('webfonts/muli.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'ConverseFontAwesomeBrands'; font-family: 'ConverseFontAwesomeBrands';
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
src: url('../dist/webfonts/fa-brands-400.eot'); src: url('webfonts/fa-brands-400.eot');
src: url('../dist/webfonts/fa-brands-400.eot?#iefix') format('embedded-opentype'), src: url('webfonts/fa-brands-400.eot?#iefix') format('embedded-opentype'),
url('../dist/webfonts/fa-brands-400.woff2') format('woff2'), url('webfonts/fa-brands-400.woff2') format('woff2'),
url('../dist/webfonts/fa-brands-400.woff') format('woff'), url('webfonts/fa-brands-400.woff') format('woff'),
url('../dist/webfonts/fa-brands-400.ttf') format('truetype'), url('webfonts/fa-brands-400.ttf') format('truetype'),
url('../dist/webfonts/fa-brands-400.svg#fontawesome') format('svg'); url('webfonts/fa-brands-400.svg#fontawesome') format('svg');
} }
@font-face { @font-face {
font-family: 'ConverseFontAwesomeRegular'; font-family: 'ConverseFontAwesomeRegular';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url('../dist/webfonts/fa-regular-400.eot'); src: url('webfonts/fa-regular-400.eot');
src: url('../dist/webfonts/fa-regular-400.eot?#iefix') format('embedded-opentype'), src: url('webfonts/fa-regular-400.eot?#iefix') format('embedded-opentype'),
url('../dist/webfonts/fa-regular-400.woff2') format('woff2'), url('webfonts/fa-regular-400.woff2') format('woff2'),
url('../dist/webfonts/fa-regular-400.woff') format('woff'), url('webfonts/fa-regular-400.woff') format('woff'),
url('../dist/webfonts/fa-regular-400.ttf') format('truetype'), url('webfonts/fa-regular-400.ttf') format('truetype'),
url('../dist/webfonts/fa-regular-400.svg#fontawesome') format('svg'); url('webfonts/fa-regular-400.svg#fontawesome') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
font-family: 'ConverseFontAwesomeSolid'; font-family: 'ConverseFontAwesomeSolid';
font-style: normal; font-style: normal;
font-weight: 900; font-weight: 900;
src: url('../dist/webfonts/fa-solid-900.eot'); src: url('webfonts/fa-solid-900.eot');
src: url('../dist/webfonts/fa-solid-900.eot?#iefix') format('embedded-opentype'), src: url('webfonts/fa-solid-900.eot?#iefix') format('embedded-opentype'),
url('../dist/webfonts/fa-solid-900.svg#fontawesome') format('svg'), url('webfonts/fa-solid-900.svg#fontawesome') format('svg'),
url('../dist/webfonts/fa-solid-900.woff2') format('woff2'), url('webfonts/fa-solid-900.woff2') format('woff2'),
url('../dist/webfonts/fa-solid-900.woff') format('woff'), url('webfonts/fa-solid-900.woff') format('woff'),
url('../dist/webfonts/fa-solid-900.ttf') format('truetype'); url('webfonts/fa-solid-900.ttf') format('truetype');
} }
......
...@@ -11,5 +11,5 @@ module.exports = merge(prod, { ...@@ -11,5 +11,5 @@ module.exports = merge(prod, {
minimize: false, minimize: false,
}, },
devtool: 'source-map', devtool: 'source-map',
plugins: [new MiniCssExtractPlugin({filename: '../dist/converse.css'})] plugins: [new MiniCssExtractPlugin({filename: 'converse.css'})]
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment