From 70de4394367717f8599b6ec7075c6f79ce0f7d47 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Mon, 6 Jul 2020 15:09:10 +0800 Subject: [PATCH 1/3] Fix baseUrl not replaced correctly in #1378 Signed-off-by: Yukai Huang --- public/views/includes/scripts.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/includes/scripts.ejs b/public/views/includes/scripts.ejs index 08a7d218..b6350614 100644 --- a/public/views/includes/scripts.ejs +++ b/public/views/includes/scripts.ejs @@ -1,4 +1,4 @@ - + <% for (var js in htmlWebpackPlugin.files.js) { %> <% } %> From 5e608a9da86954b2e882674bc96c9a549ecd2c5d Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Fri, 10 Jul 2020 16:08:45 +0800 Subject: [PATCH 2/3] Fix font loading when urlpath is set Use copy webpack plugin instead. In the old fasion Signed-off-by: Yukai Huang --- public/css/font.css | 52 ++++++++++++++++++------------------ public/views/codimd/head.ejs | 2 ++ public/views/index/head.ejs | 2 ++ public/views/pretty.ejs | 2 ++ public/views/slide.ejs | 2 ++ webpack.common.js | 23 +++++++++------- 6 files changed, 48 insertions(+), 35 deletions(-) diff --git a/public/css/font.css b/public/css/font.css index 4aa29210..de3ef6f9 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -3,7 +3,7 @@ font-family: 'Source Code Pro'; font-style: normal; font-weight: 300; - src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('/fonts/SourceCodePro-Light.woff') format('woff'); + src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('../fonts/SourceCodePro-Light.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -11,7 +11,7 @@ font-family: 'Source Code Pro'; font-style: normal; font-weight: 300; - src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('/fonts/SourceCodePro-Light.woff') format('woff'); + src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url('../fonts/SourceCodePro-Light.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* latin-ext */ @@ -19,7 +19,7 @@ font-family: 'Source Code Pro'; font-style: normal; font-weight: 400; - src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('/fonts/SourceCodePro-Regular.woff') format('woff'); + src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../fonts/SourceCodePro-Regular.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -27,7 +27,7 @@ font-family: 'Source Code Pro'; font-style: normal; font-weight: 400; - src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('/fonts/SourceCodePro-Regular.woff') format('woff'); + src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../fonts/SourceCodePro-Regular.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* latin-ext */ @@ -35,7 +35,7 @@ font-family: 'Source Code Pro'; font-style: normal; font-weight: 500; - src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('/fonts/SourceCodePro-Medium.woff') format('woff'); + src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('../fonts/SourceCodePro-Medium.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -43,7 +43,7 @@ font-family: 'Source Code Pro'; font-style: normal; font-weight: 500; - src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('/fonts/SourceCodePro-Medium.woff') format('woff'); + src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url('../fonts/SourceCodePro-Medium.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* vietnamese */ @@ -51,7 +51,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; - src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceCodePro-Medium.woff') format('woff'); + src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceCodePro-Medium.woff') format('woff'); unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -59,7 +59,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; - src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceSansPro-Light.woff') format('woff'); + src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceSansPro-Light.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -67,7 +67,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; - src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceSansPro-Light.woff') format('woff'); + src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('../fonts/SourceSansPro-Light.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* vietnamese */ @@ -75,7 +75,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff'); + src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff'); unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -83,7 +83,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff'); + src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -91,7 +91,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff'); + src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* vietnamese */ @@ -99,7 +99,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 600; - src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff'); + src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff'); unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -107,7 +107,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 600; - src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff'); + src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -115,7 +115,7 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 600; - src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('/fonts/SourceSansPro-Semibold.woff') format('woff'); + src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('../fonts/SourceSansPro-Semibold.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* vietnamese */ @@ -123,7 +123,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 300; - src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff'); + src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff'); unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -131,7 +131,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 300; - src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff'); + src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -139,7 +139,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 300; - src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('/fonts/SourceSansPro-LightItalic.woff') format('woff'); + src: local('Source Sans Pro Light Italic'), local('SourceSansPro-LightIt'), url('../fonts/SourceSansPro-LightItalic.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* vietnamese */ @@ -147,7 +147,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 400; - src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff'); + src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff'); unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -155,7 +155,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 400; - src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff'); + src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -163,7 +163,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 400; - src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('/fonts/SourceSansPro-Italic.woff') format('woff'); + src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* vietnamese */ @@ -171,7 +171,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 600; - src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff'); + src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff'); unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -179,7 +179,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 600; - src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff'); + src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -187,7 +187,7 @@ font-family: 'Source Sans Pro'; font-style: italic; font-weight: 600; - src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('/fonts/SourceSansPro-SemiboldItalic.woff') format('woff'); + src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('../fonts/SourceSansPro-SemiboldItalic.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* latin-ext */ @@ -195,7 +195,7 @@ font-family: 'Source Serif Pro'; font-style: normal; font-weight: 400; - src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('/fonts/SourceSerifPro-Regular.woff') format('woff'); + src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('../fonts/SourceSerifPro-Regular.woff') format('woff'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -203,6 +203,6 @@ font-family: 'Source Serif Pro'; font-style: normal; font-weight: 400; - src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('/fonts/SourceSerifPro-Regular.woff') format('woff'); + src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('../fonts/SourceSerifPro-Regular.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs index 451779bb..5c50756b 100644 --- a/public/views/codimd/head.ejs +++ b/public/views/codimd/head.ejs @@ -18,5 +18,7 @@ <%- include ../shared/polyfill %> <% } else { %> + + <%- include ../build/index-pack-header %> <% } %> diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs index b77b805c..8a1f08cf 100644 --- a/public/views/index/head.ejs +++ b/public/views/index/head.ejs @@ -18,5 +18,7 @@ <%- include ../build/cover-header %> <%- include ../shared/polyfill %> <% } else { %> + + <%- include ../build/cover-pack-header %> <% } %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index cdb902e9..30248a70 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -30,6 +30,8 @@ <%- include shared/polyfill %> <% } else { %> + + <%- include build/pretty-pack-header %> <% } %> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index 42b1165d..83d1539a 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -26,6 +26,8 @@ <% } else { %> + + <%- include build/slide-pack-header %> <% } %> diff --git a/webpack.common.js b/webpack.common.js index d66abcba..4866b51e 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -31,7 +31,7 @@ module.exports = { }), new HtmlWebpackPlugin({ template: 'public/views/includes/header.ejs', - chunks: ['font-pack', 'index-styles-pack', 'index-styles', 'index'], + chunks: ['index-styles-pack', 'index-styles', 'index'], filename: path.join(__dirname, 'public/views/build/index-pack-header.ejs'), inject: false, chunksSortMode: 'manual' @@ -58,7 +58,7 @@ module.exports = { }), new HtmlWebpackPlugin({ template: 'public/views/includes/header.ejs', - chunks: ['font-pack', 'cover-styles-pack', 'cover'], + chunks: ['cover-styles-pack', 'cover'], filename: path.join(__dirname, 'public/views/build/cover-pack-header.ejs'), inject: false, chunksSortMode: 'manual' @@ -85,7 +85,7 @@ module.exports = { }), new HtmlWebpackPlugin({ template: 'public/views/includes/header.ejs', - chunks: ['font-pack', 'pretty-styles-pack', 'pretty-styles', 'pretty'], + chunks: ['pretty-styles-pack', 'pretty-styles', 'pretty'], filename: path.join(__dirname, 'public/views/build/pretty-pack-header.ejs'), inject: false, chunksSortMode: 'manual' @@ -112,7 +112,7 @@ module.exports = { }), new HtmlWebpackPlugin({ template: 'public/views/includes/header.ejs', - chunks: ['font-pack', 'slide-styles-pack', 'slide-styles', 'slide'], + chunks: ['slide-styles-pack', 'slide-styles', 'slide'], filename: path.join(__dirname, 'public/views/build/slide-pack-header.ejs'), inject: false, chunksSortMode: 'manual' @@ -185,6 +185,16 @@ module.exports = { context: path.join(__dirname, 'node_modules/leaflet'), from: 'dist', to: 'leaflet' + }, + { + context: path.join(__dirname, 'node_modules/fork-awesome'), + from: 'fonts', + to: 'fork-awesome/fonts' + }, + { + context: path.join(__dirname, 'node_modules/fork-awesome'), + from: 'css', + to: 'fork-awesome/css' } ]), new MiniCssExtractPlugin() @@ -192,7 +202,6 @@ module.exports = { entry: { font: path.join(__dirname, 'public/css/google-font.css'), - 'font-pack': path.join(__dirname, 'public/css/font.css'), common: [ 'expose-loader?jQuery!expose-loader?$!jquery', 'velocity-animate', @@ -205,7 +214,6 @@ module.exports = { ], 'cover-styles-pack': [ path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'), - path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'), path.join(__dirname, 'public/css/bootstrap-social.css'), path.join(__dirname, 'node_modules/select2/select2.css'), path.join(__dirname, 'node_modules/select2/select2-bootstrap.css') @@ -260,7 +268,6 @@ module.exports = { ], 'index-styles-pack': [ path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'), - path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'), path.join(__dirname, 'public/css/bootstrap-social.css'), path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), path.join(__dirname, 'node_modules/leaflet/dist/leaflet.css') @@ -309,7 +316,6 @@ module.exports = { ], 'pretty-styles-pack': [ path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'), - path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'), path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), path.join(__dirname, 'node_modules/leaflet/dist/leaflet.css') ], @@ -349,7 +355,6 @@ module.exports = { path.join(__dirname, 'public/css/markdown.css') ], 'slide-styles-pack': [ - path.join(__dirname, 'node_modules/fork-awesome/css/fork-awesome.min.css'), path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), path.join(__dirname, 'node_modules/leaflet/dist/leaflet.css') ], From 0b164a0b931202cfc2dd258e29528cff7f97d893 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Fri, 10 Jul 2020 16:16:51 +0800 Subject: [PATCH 3/3] Fix background image ref when urlpath is set Signed-off-by: Yukai Huang --- public/js/lib/editor/markdown-lint/index.js | 1 - .../markdown-lint => markdown-lint/css}/lint.css | 10 +++++----- .../lint => markdown-lint/images}/mark-error.png | Bin .../lint => markdown-lint/images}/mark-multiple.png | Bin .../lint => markdown-lint/images}/mark-warning.png | Bin .../lint => markdown-lint/images}/message-error.png | Bin .../images}/message-warning.png | Bin public/views/codimd/head.ejs | 1 + 8 files changed, 6 insertions(+), 6 deletions(-) rename public/{js/lib/editor/markdown-lint => markdown-lint/css}/lint.css (84%) rename public/{images/lint => markdown-lint/images}/mark-error.png (100%) rename public/{images/lint => markdown-lint/images}/mark-multiple.png (100%) rename public/{images/lint => markdown-lint/images}/mark-warning.png (100%) rename public/{images/lint => markdown-lint/images}/message-error.png (100%) rename public/{images/lint => markdown-lint/images}/message-warning.png (100%) diff --git a/public/js/lib/editor/markdown-lint/index.js b/public/js/lib/editor/markdown-lint/index.js index 1b92ece2..e3a055e8 100644 --- a/public/js/lib/editor/markdown-lint/index.js +++ b/public/js/lib/editor/markdown-lint/index.js @@ -2,7 +2,6 @@ // load CM lint plugin explicitly import '@hackmd/codemirror/addon/lint/lint' -import './lint.css' window.markdownit = require('markdown-it') // eslint-disable-next-line diff --git a/public/js/lib/editor/markdown-lint/lint.css b/public/markdown-lint/css/lint.css similarity index 84% rename from public/js/lib/editor/markdown-lint/lint.css rename to public/markdown-lint/css/lint.css index 0244eae2..cad3e236 100644 --- a/public/js/lib/editor/markdown-lint/lint.css +++ b/public/markdown-lint/css/lint.css @@ -31,11 +31,11 @@ } .CodeMirror-lint-mark-error { - background-image: url(/images/lint/mark-error.png); + background-image: url(../images/mark-error.png); } .CodeMirror-lint-mark-warning { - background-image: url(/images/lint/mark-warning.png); + background-image: url(../images/mark-warning.png); } .CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning { @@ -58,15 +58,15 @@ } .CodeMirror-lint-marker-error, .CodeMirror-lint-message-error { - background-image: url(/images/lint/message-error.png); + background-image: url(../images/message-error.png); } .CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning { - background-image: url(/images/lint/message-warning.png); + background-image: url(../images/message-warning.png); } .CodeMirror-lint-marker-multiple { - background-image: url(/images/lint/mark-multiple.png); + background-image: url(../images/mark-multiple.png); background-repeat: no-repeat; background-position: right bottom; width: 100%; height: 100%; diff --git a/public/images/lint/mark-error.png b/public/markdown-lint/images/mark-error.png similarity index 100% rename from public/images/lint/mark-error.png rename to public/markdown-lint/images/mark-error.png diff --git a/public/images/lint/mark-multiple.png b/public/markdown-lint/images/mark-multiple.png similarity index 100% rename from public/images/lint/mark-multiple.png rename to public/markdown-lint/images/mark-multiple.png diff --git a/public/images/lint/mark-warning.png b/public/markdown-lint/images/mark-warning.png similarity index 100% rename from public/images/lint/mark-warning.png rename to public/markdown-lint/images/mark-warning.png diff --git a/public/images/lint/message-error.png b/public/markdown-lint/images/message-error.png similarity index 100% rename from public/images/lint/message-error.png rename to public/markdown-lint/images/message-error.png diff --git a/public/images/lint/message-warning.png b/public/markdown-lint/images/message-warning.png similarity index 100% rename from public/images/lint/message-warning.png rename to public/markdown-lint/images/message-warning.png diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs index 5c50756b..810781bb 100644 --- a/public/views/codimd/head.ejs +++ b/public/views/codimd/head.ejs @@ -22,3 +22,4 @@ <%- include ../build/index-pack-header %> <% } %> +