Merge branch 'main' of https://github.com/go-gitea/gitea

* 'main' of https://github.com/go-gitea/gitea: Fix CSS specificity issue with easymde's css (go-gitea#18201)
zjjhot · Jan 7, 2022 · 65adde5 · 65adde5
2 parents 4839f4d + 3dbdf36
commit 65adde5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/web_src/js/features/comp/EasyMDE.js b/web_src/js/features/comp/EasyMDE.js
@@ -25,10 +25,10 @@ export async function importEasyMDE() {
   // https://github.com/codemirror/CodeMirror/issues/5484
   // https://github.com/codemirror/CodeMirror/issues/4838
 
+  // EasyMDE's CSS should be loaded via webpack config, otherwise our own styles can not overwrite the default styles.
   const [{default: EasyMDE}, {default: CodeMirror}] = await Promise.all([
     import(/* webpackChunkName: "easymde" */'easymde'),
     import(/* webpackChunkName: "codemirror" */'codemirror'),
-    import(/* webpackChunkName: "easymde" */'easymde/dist/easymde.min.css'),
   ]);
 
   // CodeMirror plugins must be loaded by a "Plain browser env"

diff --git a/webpack.config.js b/webpack.config.js
@@ -46,6 +46,7 @@ export default {
       resolve(__dirname, 'web_src/js/jquery.js'),
       resolve(__dirname, 'web_src/fomantic/build/semantic.js'),
       resolve(__dirname, 'web_src/js/index.js'),
+      resolve(__dirname, 'node_modules/easymde/dist/easymde.min.css'),
       resolve(__dirname, 'web_src/fomantic/build/semantic.css'),
       resolve(__dirname, 'web_src/less/misc.css'),
       resolve(__dirname, 'web_src/less/index.less'),