Fix creation page not displayed in pad and slide

This commit is contained in:
yflory 2017-12-11 17:17:06 +01:00
parent 4e46d0daa5
commit c269929319
7 changed files with 28 additions and 30 deletions

View File

@ -6,12 +6,9 @@
z-index: 100000001 !important;
}
#cp-creation-container {
//position: fixed;
position: absolute;
z-index: 100000000; // #loading * 10
//top: 0px;
//bottom: 0px;
//left: 0px;
//right: 0px;
top: 0px;
background: @colortheme_loading-bg;
color: @colortheme_loading-color;
display: flex;

View File

@ -0,0 +1,18 @@
@import (once) "./toolbar.less";
@import (once) './fileupload.less';
@import (once) './alertify.less';
@import (once) './tokenfield.less';
@import (once) './creation.less';
.framework_main(@bg-color, @warn-color, @color) {
.toolbar_main(
@bg-color: @bg-color,
@warn-color: @warn-color,
@color: @color
);
.fileupload_main();
.alertify_main();
.tokenfield_main();
.creation_main();
}

View File

@ -1,20 +1,13 @@
@import (once) "../../customize/src/less2/include/browser.less";
@import (once) "../../customize/src/less2/include/toolbar.less";
@import (once) "../../customize/src/less2/include/markdown.less";
@import (once) '../../customize/src/less2/include/fileupload.less';
@import (once) '../../customize/src/less2/include/alertify.less';
@import (once) '../../customize/src/less2/include/tokenfield.less';
@import (once) '../../customize/src/less2/include/creation.less';
@import (once) "../../customize/src/less2/include/framework.less";
.toolbar_main(
.framework_main(
@bg-color: @colortheme_code-bg,
@warn-color: @colortheme_code-warn,
@color: @colortheme_code-color
);
.fileupload_main();
.alertify_main();
.tokenfield_main();
.creation_main();
// body
&.cp-app-code {

View File

@ -278,7 +278,7 @@ define([
}
}
if (newPad) {
if (newPad && !AppConfig.displayCreationScreen) {
common.openTemplatePicker();
}
};

View File

@ -617,7 +617,6 @@ define([
updateMeta();
var rtConfig = {};
console.log(edPublic);
if (data.owned) {
//rtConfig.owners = [edPublic];
}
@ -636,7 +635,6 @@ define([
return;
}
// Start realtime outside the iframe and callback
console.log(data);
startRealtime(rtConfig);
cb();
});

View File

@ -1,8 +1,6 @@
@import (once) "../../customize/src/less2/include/toolbar.less";
@import (once) '../../customize/src/less2/include/alertify.less';
@import (once) '../../customize/src/less2/include/tokenfield.less';
@import (once) "../../customize/src/less2/include/framework.less";
.toolbar_main(
.framework_main(
@bg-color: @colortheme_pad-bg,
@warn-color: @colortheme_pad-warn,
@color: @colortheme_pad-color

View File

@ -1,20 +1,14 @@
@import (once) "../../customize/src/less2/include/browser.less";
@import (once) "../../customize/src/less2/include/toolbar.less";
@import (once) "../../customize/src/less2/include/markdown.less";
@import (once) '../../customize/src/less2/include/fileupload.less';
@import (once) '../../customize/src/less2/include/alertify.less';
@import (once) "../../customize/src/less2/include/mediatag.less";
@import (once) '../../customize/src/less2/include/tokenfield.less';
@import (once) "../../customize/src/less2/include/framework.less";
.mediatag_base();
.toolbar_main(
.framework_main(
@bg-color: @colortheme_slide-bg,
@warn-color: @colortheme_slide-warn,
@color: @colortheme_slide-color
);
.fileupload_main();
.alertify_main();
.tokenfield_main();
// body
font-size: unset;