Fix history colors

pull/1/head
yflory 5 years ago
parent 9ad1477d1b
commit b449ae9f8b

@ -82,7 +82,7 @@
} }
} }
button { button {
color: inherit; color: @cryptpad_text_col;
background-color: rgba(0,0,0,0.2); background-color: rgba(0,0,0,0.2);
&:hover { &:hover {
background-color: rgba(0,0,0,0.4); background-color: rgba(0,0,0,0.4);

@ -69,7 +69,7 @@
} }
.toolbar_vars(); .toolbar_vars();
@toolbar-top-bg: #f9f9f9; @toolbar-top-bg: #eee;
@toolbar_line-height: 32px; @toolbar_line-height: 32px;
@toolbar_top-height: 76px; @toolbar_top-height: 76px;
@toolbar_button-font: @colortheme_app-font; @toolbar_button-font: @colortheme_app-font;
@ -921,6 +921,11 @@
} }
} }
.cp-toolbar-history {
background-color: @toolbar-bg-color-light;
background-color: var(--toolbar-bg-color-light);
color: @cryptpad_text_col;
}
.cp-toolbar-bottom { .cp-toolbar-bottom {
background-color: @toolbar-bg-color-light; background-color: @toolbar-bg-color-light;
background-color: var(--toolbar-bg-color-light); background-color: var(--toolbar-bg-color-light);

@ -3010,7 +3010,7 @@ define([
APP.$collapseButton.off('click').on('click', function () { APP.$collapseButton.off('click').on('click', function () {
APP.$tree.toggle(); APP.$tree.toggle();
checkCollapseButton(); checkCollapseButton();
}) });
}; };
var createToolbar = function () { var createToolbar = function () {
var $toolbar = APP.toolbar.$bottom; var $toolbar = APP.toolbar.$bottom;

@ -112,13 +112,11 @@ define([
var c = 0;//states.length - 1; var c = 0;//states.length - 1;
var $hist = $toolbar.find('.cp-toolbar-history'); var $hist = $toolbar.find('.cp-toolbar-history');
var $left = $toolbar.find('.cp-toolbar-leftside'); var $bottom = $toolbar.find('.cp-toolbar-bottom');
var $right = $toolbar.find('.cp-toolbar-rightside');
var $cke = $toolbar.find('.cke_toolbox_main'); var $cke = $toolbar.find('.cke_toolbox_main');
$hist.html('').css('display', 'flex'); $hist.html('').css('display', 'flex');
$left.hide(); $bottom.hide();
$right.hide();
$cke.hide(); $cke.hide();
UI.spinner($hist).get().show(); UI.spinner($hist).get().show();
@ -277,8 +275,7 @@ define([
var onKeyDown, onKeyUp; var onKeyDown, onKeyUp;
var close = function () { var close = function () {
$hist.hide(); $hist.hide();
$left.show(); $bottom.show();
$right.show();
$cke.show(); $cke.show();
$(window).trigger('resize'); $(window).trigger('resize');
$(window).off('keydown', onKeyDown); $(window).off('keydown', onKeyDown);

Loading…
Cancel
Save