chore(lib): update mermaid 8.4.2 -> 8.4.8 echarts 4.5.0 -> 4.6.0 gita…

…lk 1.5.0 -> 1.6.0
pogor-dev · Feb 24, 2020 · 7e56922 · 7e56922
1 parent ef88651
commit 7e56922
Show file tree

Hide file tree

Showing 33 changed files with 218 additions and 130 deletions.
diff --git a/assets/css/mermaid.scss b/assets/css/mermaid.scss
diff --git a/static/js/theme.min.js → assets/js/theme.min.js b/static/js/theme.min.js → assets/js/theme.min.js
diff --git a/static/js/theme.min.js.map → assets/js/theme.min.js.map b/static/js/theme.min.js.map → assets/js/theme.min.js.map
diff --git a/assets/lib/VERSION b/assets/lib/VERSION
@@ -7,10 +7,10 @@ [email protected] https://github.com/aFarkas/lazysizes
 [email protected] [email protected] [email protected] https://github.com/sachinchoolur/lightgallery.js
 [email protected] https://github.com/alexmacarthur/typeit
 [email protected] https://github.com/KaTeX/KaTeX
-[email protected].2 https://github.com/knsv/mermaid
+[email protected].8 https://github.com/knsv/mermaid
 [email protected] https://github.com/MoePlayer/APlayer
 [email protected] https://github.com/metowolf/MetingJS
-echarts@4.5.0 https://github.com/apache/incubator-echarts
-gitalk@1.5.0 https://github.com/gitalk/gitalk
+echarts@4.6.0 https://echarts.apache.org/
+gitalk@1.6.0 https://github.com/gitalk/gitalk
 [email protected] https://valine.js.org/
 iconfont https://www.iconfont.cn/
diff --git a/assets/lib/echarts/echarts.min.js b/assets/lib/echarts/echarts.min.js
diff --git a/assets/lib/echarts/macarons.js b/assets/lib/echarts/macarons.js
@@ -17,19 +17,22 @@
 * under the License.
 */
 
-(function (root, factory) {
+(function(root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
         define(['exports', 'echarts'], factory);
-    } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
+    } else if (
+        typeof exports === 'object' &&
+        typeof exports.nodeName !== 'string'
+    ) {
         // CommonJS
         factory(exports, require('echarts'));
     } else {
         // Browser globals
         factory({}, root.echarts);
     }
-}(this, function (exports, echarts) {
-    var log = function (msg) {
+})(this, function(exports, echarts) {
+    var log = function(msg) {
         if (typeof console !== 'undefined') {
             console && console.error && console.error(msg);
         }
@@ -40,13 +43,28 @@
     }
 
     var colorPalette = [
-        '#2ec7c9','#b6a2de','#5ab1ef','#ffb980','#d87a80',
-        '#8d98b3','#e5cf0d','#97b552','#95706d','#dc69aa',
-        '#07a2a4','#9a7fd1','#588dd5','#f5994e','#c05050',
-        '#59678c','#c9ab00','#7eb00a','#6f5553','#c14089'
+        '#2ec7c9',
+        '#b6a2de',
+        '#5ab1ef',
+        '#ffb980',
+        '#d87a80',
+        '#8d98b3',
+        '#e5cf0d',
+        '#97b552',
+        '#95706d',
+        '#dc69aa',
+        '#07a2a4',
+        '#9a7fd1',
+        '#588dd5',
+        '#f5994e',
+        '#c05050',
+        '#59678c',
+        '#c9ab00',
+        '#7eb00a',
+        '#6f5553',
+        '#c14089'
     ];
 
-
     var theme = {
         color: colorPalette,
 
@@ -59,7 +77,7 @@
 
         visualMap: {
             itemWidth: 15,
-            color: ['#5ab1ef','#e0ffff']
+            color: ['#5ab1ef', '#e0ffff']
         },
 
         toolbox: {
@@ -72,15 +90,15 @@
 
         tooltip: {
             backgroundColor: 'rgba(50,50,50,0.5)',
-            axisPointer : {
-                type : 'line',
-                lineStyle : {
+            axisPointer: {
+                type: 'line',
+                lineStyle: {
                     color: '#008acd'
                 },
                 crossStyle: {
                     color: '#008acd'
                 },
-                shadowStyle : {
+                shadowStyle: {
                     color: 'rgba(200,200,200,0.2)'
                 }
             }
@@ -115,10 +133,10 @@
                     color: '#008acd'
                 }
             },
-            splitArea : {
-                show : true,
-                areaStyle : {
-                    color: ['rgba(250,250,250,0.1)','rgba(200,200,200,0.1)']
+            splitArea: {
+                show: true,
+                areaStyle: {
+                    color: ['rgba(250,250,250,0.1)', 'rgba(200,200,200,0.1)']
                 }
             },
             splitLine: {
@@ -128,34 +146,37 @@
             }
         },
 
-        timeline : {
-            lineStyle : {
-                color : '#008acd'
+        timeline: {
+            lineStyle: {
+                color: '#008acd'
             },
-            controlStyle : {
-                normal : { color : '#008acd'},
-                emphasis : { color : '#008acd'}
+            controlStyle: {
+                color: '#008acd',
+                borderColor: '#008acd'
             },
-            symbol : 'emptyCircle',
-            symbolSize : 3
+            symbol: 'emptyCircle',
+            symbolSize: 3
         },
 
         line: {
-            smooth : true,
+            smooth: true,
             symbol: 'emptyCircle',
             symbolSize: 3
         },
 
         candlestick: {
             itemStyle: {
-                normal: {
-                    color: '#d87a80',
-                    color0: '#2ec7c9',
-                    lineStyle: {
-                        color: '#d87a80',
-                        color0: '#2ec7c9'
-                    }
-                }
+                color: '#d87a80',
+                color0: '#2ec7c9'
+            },
+            lineStyle: {
+                width: 1,
+                color: '#d87a80',
+                color0: '#2ec7c9'
+            },
+            areaStyle: {
+                color: '#2ec7c9',
+                color0: '#b6a2de'
             }
         },
 
@@ -165,53 +186,55 @@
         },
 
         map: {
-            label: {
-                normal: {
-                    textStyle: {
-                        color: '#d87a80'
-                    }
-                }
-            },
             itemStyle: {
-                normal: {
-                    borderColor: '#eee',
-                    areaColor: '#ddd'
-                },
-                emphasis: {
-                    areaColor: '#fe994e'
-                }
+                color: '#ddd'
+            },
+            areaStyle: {
+                color: '#fe994e'
+            },
+            label: {
+                color: '#d87a80'
             }
         },
 
         graph: {
-            color: colorPalette
+            itemStyle: {
+                color: '#d87a80'
+            },
+            linkStyle: {
+                color: '#2ec7c9'
+            }
         },
 
-        gauge : {
+        gauge: {
             axisLine: {
                 lineStyle: {
-                    color: [[0.2, '#2ec7c9'],[0.8, '#5ab1ef'],[1, '#d87a80']],
+                    color: [
+                        [0.2, '#2ec7c9'],
+                        [0.8, '#5ab1ef'],
+                        [1, '#d87a80']
+                    ],
                     width: 10
                 }
             },
             axisTick: {
                 splitNumber: 10,
-                length :15,
+                length: 15,
                 lineStyle: {
                     color: 'auto'
                 }
             },
             splitLine: {
-                length :22,
+                length: 22,
                 lineStyle: {
                     color: 'auto'
                 }
             },
-            pointer : {
-                width : 5
+            pointer: {
+                width: 5
             }
         }
     };
 
     echarts.registerTheme('macarons', theme);
-}));
+});
diff --git a/assets/lib/gitalk/gitalk.css b/assets/lib/gitalk/gitalk.css
diff --git a/assets/lib/gitalk/gitalk.min.js b/assets/lib/gitalk/gitalk.min.js
diff --git a/assets/lib/mermaid/mermaid.min.js b/assets/lib/mermaid/mermaid.min.js
diff --git a/assets/lib/mermaid/mermaid.scss b/assets/lib/mermaid/mermaid.scss
@@ -1,20 +1,11 @@
-// [email protected]
-@import 'flowchart';
-@import 'sequence';
-@import 'gantt';
-@import 'class';
-@import 'git';
-@import 'pie';
-@import 'state';
+.mermaid {
+  width: 100%;
+  margin: 3% auto;
+  text-align: center;
 
-// .composit {
-//   fill: white;
-//   border-bottom: 1px
-// }
+  @import "themes/neutral/index";
 
-:root {
-  --mermaid-font-family: '"trebuchet ms", verdana, arial';
-  --mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive;
-  // --mermaid-alt-font-family: '"Lucida Console", Monaco, monospace';
+  .dark-theme & {
+    @import "themes/dark/index";
+  }
 }
-
diff --git a/assets/lib/mermaid/class.scss → assets/lib/mermaid/themes/class.scss b/assets/lib/mermaid/class.scss → assets/lib/mermaid/themes/class.scss
@@ -10,6 +10,10 @@ g.classGroup text {
   }
 }
 
+g.clickable {
+  cursor: pointer;
+}
+
 g.classGroup rect {
   fill: $nodeBkg;
   stroke: $nodeBorder;
@@ -38,6 +42,10 @@ g.classGroup line {
   fill: none;
 }
 
+.dashed-line{
+  stroke-dasharray: 3;
+}
+
 @mixin composition {
   fill: $nodeBorder;
   stroke: $nodeBorder;

diff --git a/assets/lib/mermaid/dark/index.scss → assets/lib/mermaid/themes/dark/index.scss b/assets/lib/mermaid/dark/index.scss → assets/lib/mermaid/themes/dark/index.scss
diff --git a/assets/lib/mermaid/default/index.scss → assets/lib/mermaid/themes/default/index.scss b/assets/lib/mermaid/default/index.scss → assets/lib/mermaid/themes/default/index.scss
diff --git a/assets/lib/mermaid/flowchart.scss → assets/lib/mermaid/themes/flowchart.scss b/assets/lib/mermaid/flowchart.scss → assets/lib/mermaid/themes/flowchart.scss
@@ -11,7 +11,8 @@
 .node rect,
 .node circle,
 .node ellipse,
-.node polygon {
+.node polygon,
+.node path {
   fill: $mainBkg;
   stroke: $nodeBorder;
   stroke-width: 1px;

diff --git a/assets/lib/mermaid/forest/index.scss → assets/lib/mermaid/themes/forest/index.scss b/assets/lib/mermaid/forest/index.scss → assets/lib/mermaid/themes/forest/index.scss
diff --git a/assets/lib/mermaid/gantt.scss → assets/lib/mermaid/themes/gantt.scss b/assets/lib/mermaid/gantt.scss → assets/lib/mermaid/themes/gantt.scss
@@ -54,7 +54,7 @@
 
 .grid .tick {
   stroke: $gridColor;
-  opacity: 0.3;
+  opacity: 0.8;
   shape-rendering: crispEdges;
   text {
     font-family: 'trebuchet ms', verdana, arial;

diff --git a/assets/lib/mermaid/git.scss → assets/lib/mermaid/themes/git.scss b/assets/lib/mermaid/git.scss → assets/lib/mermaid/themes/git.scss