merge dark2 into dark

4 years ago · fd7e15fe8e
parent 5af6aaa57e ef76665b76
commit fd7e15fe8e
2 changed files with 1 additions and 2 deletions
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@ -40,7 +40,7 @@ define([
                    Mermaid = _Mermaid;
                    Mermaid.initialize({
                        gantt: { axisFormat: '%m-%d', },
-                        theme: window.CryptPad_theme === 'dark' ? 'dark' : undefined,
+                        theme: (window.CryptPad_theme === 'dark') ? 'dark' : undefined,
                        "themeCSS": mermaidThemeCSS,
                    });
                }
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@ -167,7 +167,6 @@
        justify-content: space-between;
        padding: 5px;
        flex-wrap: wrap;
-        touch-action: none;
        background: @cp_kanban-item-bg;
        .tools_unselectable();
        touch-action: none;