Merge pull request pandao#283 from junjun16818/master

pandao · web-flow · commit 540d90158aee · 2019-05-04T15:43:17.000+08:00
webpack require editormd.css get  editormd-logo.eot  url error
diff --git a/css/editormd.css b/css/editormd.css
@@ -3081,7 +3081,7 @@
 @font-face {
   font-family: 'editormd-logo';
   src: url("../fonts/editormd-logo.eot?-5y8q6h");
-  src: url(".../fonts/editormd-logo.eot?#iefix-5y8q6h") format("embedded-opentype"), url("../fonts/editormd-logo.woff?-5y8q6h") format("woff"), url("../fonts/editormd-logo.ttf?-5y8q6h") format("truetype"), url("../fonts/editormd-logo.svg?-5y8q6h#icomoon") format("svg");
+  src: url("../fonts/editormd-logo.eot?#iefix-5y8q6h") format("embedded-opentype"), url("../fonts/editormd-logo.woff?-5y8q6h") format("woff"), url("../fonts/editormd-logo.ttf?-5y8q6h") format("truetype"), url("../fonts/editormd-logo.svg?-5y8q6h#icomoon") format("svg");
   font-weight: normal;
   font-style: normal;
 }
diff --git a/scss/editormd.logo.scss b/scss/editormd.logo.scss
@@ -6,7 +6,7 @@
 @font-face {
 	font-family: 'editormd-logo';
 	src:url('../fonts/editormd-logo.eot?-5y8q6h');
-	src:url('.../fonts/editormd-logo.eot?#iefix-5y8q6h') format('embedded-opentype'),
+	src:url('../fonts/editormd-logo.eot?#iefix-5y8q6h') format('embedded-opentype'),
 		url('../fonts/editormd-logo.woff?-5y8q6h') format('woff'),
 		url('../fonts/editormd-logo.ttf?-5y8q6h') format('truetype'),
 		url('../fonts/editormd-logo.svg?-5y8q6h#icomoon') format('svg');
@@ -86,4 +86,4 @@
 
 #{$prefix}logo-color {
     color: $mainColor;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -3081,7 +3081,7 @@`
`3081`	`3081`	`@font-face {`
`3082`	`3082`	`font-family: 'editormd-logo';`
`3083`	`3083`	`src: url("../fonts/editormd-logo.eot?-5y8q6h");`
`3084`		`- src: url(".../fonts/editormd-logo.eot?#iefix-5y8q6h") format("embedded-opentype"), url("../fonts/editormd-logo.woff?-5y8q6h") format("woff"), url("../fonts/editormd-logo.ttf?-5y8q6h") format("truetype"), url("../fonts/editormd-logo.svg?-5y8q6h#icomoon") format("svg");`
	`3084`	`+ src: url("../fonts/editormd-logo.eot?#iefix-5y8q6h") format("embedded-opentype"), url("../fonts/editormd-logo.woff?-5y8q6h") format("woff"), url("../fonts/editormd-logo.ttf?-5y8q6h") format("truetype"), url("../fonts/editormd-logo.svg?-5y8q6h#icomoon") format("svg");`
`3085`	`3085`	`font-weight: normal;`
`3086`	`3086`	`font-style: normal;`
`3087`	`3087`	`}`