dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix overflowing spinner when loading history

This commit is contained in:
yflory 2020-09-29 16:49:40 +02:00
parent 3f0dbe7565
commit 21eb1b6a1b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,11 @@
font: @colortheme_app-font;
}
&.cp-history-init {
padding: 0;
height: 32px;
}
.cp-toolbar-history-timeline {
display: flex;
flex-flow: column;

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

@ -20,6 +20,7 @@ define([
History.state = true;
var $toolbar = config.$toolbar;
var $hist = $toolbar.find('.cp-toolbar-history');
$hist.addClass('cp-history-init');
if (!config.applyVal || !config.setHistory || !config.onLocal || !config.onRemote) {
throw new Error("Missing config element: applyVal, onLocal, onRemote, setHistory");
@ -411,6 +412,7 @@ define([
// Create the history toolbar
var display = function () {
$hist.html('');
$hist.removeClass('cp-history-init');
var fastPrev = h('button.cp-toolbar-history-previous', { title: Messages.history_fastPrev }, [
h('i.fa.fa-step-backward'),
@ -524,8 +526,8 @@ define([
}
if (config.drive) {
$hist.addClass('cp-history-drive');
snapshot.disabled = true;
share.disabled = true;
$(snapshot).hide();
$(share).hide();
}
$hist.append([timeline, actions]);