diff --git a/.gitignore b/.gitignore index 4ab5d3245..e1c128401 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,10 @@ -node_modules - -*.sublime-project -*.sublime-workspace - .DS_Store -.idea + +node_modules coverage test/tmp_* test/fixtures/samples/*.actual* dist/*.js -dist/*.css +dist/themes/*.css diff --git a/dist/demo/index.html b/dist/index.html similarity index 95% rename from dist/demo/index.html rename to dist/index.html index a71dba085..32c6eb914 100644 --- a/dist/demo/index.html +++ b/dist/index.html @@ -5,7 +5,7 @@ Mermaid Quick Test Page - +
@@ -98,7 +98,7 @@ Class01 : int chimp Class01 : int gorilla Class08 <--> C2: Cool label
- + diff --git a/todo.md b/todo.md index eca389f76..e81f040d4 100644 --- a/todo.md +++ b/todo.md @@ -19,3 +19,5 @@ - global.mermaid_config - rewrite logger - rewrite less code +- Don't generate temp_* folders in test/ folder + - Generate them into system temp folder instead diff --git a/webpack.config.base.js b/webpack.config.base.js index 5e52e4315..260bd7019 100644 --- a/webpack.config.base.js +++ b/webpack.config.base.js @@ -52,13 +52,13 @@ export const lessConfig = () => { return { target: 'web', entry: { - 'mermaid': './src/less/default/mermaid.less', + 'mermaid.default': './src/less/default/mermaid.less', 'mermaid.dark': './src/less/dark/mermaid.less', 'mermaid.forest': './src/less/forest/mermaid.less', 'mermaid.neutral': './src/less/neutral/mermaid.less' }, output: { - path: path.join(__dirname, './dist/'), + path: path.join(__dirname, './dist/themes'), filename: '[name].css' }, module: {