diff --git a/customize.dist/src/less2/include/toolbar-history.less b/customize.dist/src/less2/include/toolbar-history.less index cb41c2112..7538fb2bc 100644 --- a/customize.dist/src/less2/include/toolbar-history.less +++ b/customize.dist/src/less2/include/toolbar-history.less @@ -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); diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less index 2b01419bd..8fa846ddf 100644 --- a/customize.dist/src/less2/include/toolbar.less +++ b/customize.dist/src/less2/include/toolbar.less @@ -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); diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index 3489cbc83..8147b50fb 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -3010,7 +3010,7 @@ define([ APP.$collapseButton.off('click').on('click', function () { APP.$tree.toggle(); checkCollapseButton(); - }) + }); }; var createToolbar = function () { var $toolbar = APP.toolbar.$bottom; diff --git a/www/common/sframe-common-history.js b/www/common/sframe-common-history.js index 0217fee7a..d3d298197 100644 --- a/www/common/sframe-common-history.js +++ b/www/common/sframe-common-history.js @@ -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);