infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix history colors

pull/1/head
yflory 2020-05-15 11:43:14 +02:00
parent 9ad1477d1b
commit b449ae9f8b
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/src/less2/include/toolbar-history.less
View File

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

7
customize.dist/src/less2/include/toolbar.less
View File

@ -69,7 +69,7 @@
}
.toolbar_vars();
@toolbar-top-bg: #f9f9f9;
@toolbar-top-bg: #eee;
@toolbar_line-height: 32px;
@toolbar_top-height: 76px;
@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 {
background-color: @toolbar-bg-color-light;
background-color: var(--toolbar-bg-color-light);

2
www/common/drive-ui.js
View File

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

9
www/common/sframe-common-history.js
View File

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