merge dark2 into dark

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,
                     });
                 }

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;