web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz 2017-11-21 18:22:08 +01:00
commit eac6afba24
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
.cp-toolbar-history { .cp-toolbar-history {
display: none; display: none;
text-align: center; text-align: center;
width: 100%;
* { * {
font: @colortheme_app-font; font: @colortheme_app-font;
} }

1
www/debug/app-debug.less
View File

@ -20,6 +20,7 @@
#cp-app-debug { #cp-app-debug {
flex: 1; flex: 1;
display: flex; display: flex;
min-height: 0;
} }
#cp-app-debug-content { #cp-app-debug-content {
flex: 1; flex: 1;

7
www/debug/inner.js
View File

@ -39,7 +39,8 @@ define([
$: $, $: $,
AppConfig: AppConfig, AppConfig: AppConfig,
SFCommon: SFCommon, SFCommon: SFCommon,
Crypto: Crypto Crypto: Crypto,
ApiConfig: ApiConfig
}; };
var toolbar; var toolbar;
@ -167,8 +168,8 @@ define([
console.log('onConnectionChange', info.state); console.log('onConnectionChange', info.state);
}; };
cpNfInner = common.startRealtime(config); cpNfInner = APP.cpNfInner = common.startRealtime(config);
metadataMgr = cpNfInner.metadataMgr; metadataMgr = APP.metadataMgr = cpNfInner.metadataMgr;
cpNfInner.onInfiniteSpinner(function () { cpNfInner.onInfiniteSpinner(function () {
console.error('infinite spinner'); console.error('infinite spinner');