Merge remote-tracking branch 'origin/dark' into dark

pull/1/head
David Benqué 4 years ago
commit 63eef5bc7e

@ -388,6 +388,7 @@ define([
})); }));
}; };
$t.closest('.tokenfield').removeClass('form-control');
t.focus = function () { t.focus = function () {
var $temp = $t.closest('.tokenfield').find('.token-input'); var $temp = $t.closest('.tokenfield').find('.token-input');
$temp.css('width', '20%'); $temp.css('width', '20%');

@ -40,7 +40,7 @@ define([
Mermaid = _Mermaid; Mermaid = _Mermaid;
Mermaid.initialize({ Mermaid.initialize({
gantt: { axisFormat: '%m-%d', }, gantt: { axisFormat: '%m-%d', },
theme: window.CryptPad_theme === 'dark' ? 'dark' : undefined, theme: (window.CryptPad_theme === 'dark') ? 'dark' : undefined,
"themeCSS": mermaidThemeCSS, "themeCSS": mermaidThemeCSS,
}); });
} }

@ -167,7 +167,6 @@
justify-content: space-between; justify-content: space-between;
padding: 5px; padding: 5px;
flex-wrap: wrap; flex-wrap: wrap;
touch-action: none;
background: @cp_kanban-item-bg; background: @cp_kanban-item-bg;
.tools_unselectable(); .tools_unselectable();
touch-action: none; touch-action: none;

Loading…
Cancel
Save