瀏覽代碼

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

JC Brand 5 年之前
父節點
當前提交
63da4b4b49

+ 20 - 20
sass/font-awesome.scss

@@ -2,38 +2,38 @@
   font-family: 'Baumans';
   font-style: normal;
   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-family: 'Muli';
   font-style: normal;
   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-family: 'ConverseFontAwesomeBrands';
   font-style: normal;
   font-weight: normal;
-  src: url('../dist/webfonts/fa-brands-400.eot');
-  src: url('../dist/webfonts/fa-brands-400.eot?#iefix') format('embedded-opentype'),
-  url('../dist/webfonts/fa-brands-400.woff2') format('woff2'),
-  url('../dist/webfonts/fa-brands-400.woff') format('woff'),
-  url('../dist/webfonts/fa-brands-400.ttf') format('truetype'),
-  url('../dist/webfonts/fa-brands-400.svg#fontawesome') format('svg');
+  src: url('webfonts/fa-brands-400.eot');
+  src: url('webfonts/fa-brands-400.eot?#iefix') format('embedded-opentype'),
+  url('webfonts/fa-brands-400.woff2') format('woff2'),
+  url('webfonts/fa-brands-400.woff') format('woff'),
+  url('webfonts/fa-brands-400.ttf') format('truetype'),
+  url('webfonts/fa-brands-400.svg#fontawesome') format('svg');
 }
 
 @font-face {
   font-family: 'ConverseFontAwesomeRegular';
   font-style: normal;
   font-weight: 400;
-  src: url('../dist/webfonts/fa-regular-400.eot');
-  src: url('../dist/webfonts/fa-regular-400.eot?#iefix') format('embedded-opentype'),
-    url('../dist/webfonts/fa-regular-400.woff2') format('woff2'),
-    url('../dist/webfonts/fa-regular-400.woff') format('woff'),
-    url('../dist/webfonts/fa-regular-400.ttf') format('truetype'),
-    url('../dist/webfonts/fa-regular-400.svg#fontawesome') format('svg');
+  src: url('webfonts/fa-regular-400.eot');
+  src: url('webfonts/fa-regular-400.eot?#iefix') format('embedded-opentype'),
+    url('webfonts/fa-regular-400.woff2') format('woff2'),
+    url('webfonts/fa-regular-400.woff') format('woff'),
+    url('webfonts/fa-regular-400.ttf') format('truetype'),
+    url('webfonts/fa-regular-400.svg#fontawesome') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -42,12 +42,12 @@
   font-family: 'ConverseFontAwesomeSolid';
   font-style: normal;
   font-weight: 900;
-  src: url('../dist/webfonts/fa-solid-900.eot');
-  src: url('../dist/webfonts/fa-solid-900.eot?#iefix') format('embedded-opentype'),
-  url('../dist/webfonts/fa-solid-900.svg#fontawesome') format('svg'),
-  url('../dist/webfonts/fa-solid-900.woff2') format('woff2'),
-  url('../dist/webfonts/fa-solid-900.woff') format('woff'),
-  url('../dist/webfonts/fa-solid-900.ttf') format('truetype');
+  src: url('webfonts/fa-solid-900.eot');
+  src: url('webfonts/fa-solid-900.eot?#iefix') format('embedded-opentype'),
+  url('webfonts/fa-solid-900.svg#fontawesome') format('svg'),
+  url('webfonts/fa-solid-900.woff2') format('woff2'),
+  url('webfonts/fa-solid-900.woff') format('woff'),
+  url('webfonts/fa-solid-900.ttf') format('truetype');
 }
 
 

+ 0 - 0
dist/webfonts/baumans.ttf → sass/webfonts/baumans.ttf


+ 0 - 0
dist/webfonts/fa-brands-400.eot → sass/webfonts/fa-brands-400.eot


+ 0 - 0
dist/webfonts/fa-brands-400.svg → sass/webfonts/fa-brands-400.svg


+ 0 - 0
dist/webfonts/fa-brands-400.ttf → sass/webfonts/fa-brands-400.ttf


+ 0 - 0
dist/webfonts/fa-brands-400.woff → sass/webfonts/fa-brands-400.woff


+ 0 - 0
dist/webfonts/fa-brands-400.woff2 → sass/webfonts/fa-brands-400.woff2


+ 0 - 0
dist/webfonts/fa-regular-400.eot → sass/webfonts/fa-regular-400.eot


+ 0 - 0
dist/webfonts/fa-regular-400.svg → sass/webfonts/fa-regular-400.svg


+ 0 - 0
dist/webfonts/fa-regular-400.ttf → sass/webfonts/fa-regular-400.ttf


+ 0 - 0
dist/webfonts/fa-regular-400.woff → sass/webfonts/fa-regular-400.woff


+ 0 - 0
dist/webfonts/fa-regular-400.woff2 → sass/webfonts/fa-regular-400.woff2


+ 0 - 0
dist/webfonts/fa-solid-900.eot → sass/webfonts/fa-solid-900.eot


+ 0 - 0
dist/webfonts/fa-solid-900.svg → sass/webfonts/fa-solid-900.svg


+ 0 - 0
dist/webfonts/fa-solid-900.ttf → sass/webfonts/fa-solid-900.ttf


+ 0 - 0
dist/webfonts/fa-solid-900.woff → sass/webfonts/fa-solid-900.woff


+ 0 - 0
dist/webfonts/fa-solid-900.woff2 → sass/webfonts/fa-solid-900.woff2


+ 0 - 0
dist/webfonts/muli.ttf → sass/webfonts/muli.ttf


+ 1 - 1
webpack.dev.js

@@ -11,5 +11,5 @@ module.exports = merge(prod, {
         minimize: false,
     },
     devtool: 'source-map',
-    plugins: [new MiniCssExtractPlugin({filename: '../dist/converse.css'})]
+    plugins: [new MiniCssExtractPlugin({filename: 'converse.css'})]
 });