Merge branch 'less-less' into staging

This commit is contained in:
yflory
2018-07-18 14:18:37 +02:00
76 changed files with 3627 additions and 3427 deletions

View File

@@ -1,16 +1,14 @@
@import (once) "../../customize/src/less2/include/browser.less";
@import (once) "../../customize/src/less2/include/markdown.less";
@import (once) '../../customize/src/less2/include/tools.less';
@import (once) "../../customize/src/less2/include/framework.less";
@import (reference) '../../customize/src/less2/include/tools.less';
@import (reference) "../../customize/src/less2/include/framework.less";
.framework_main(
@bg-color: @colortheme_whiteboard-bg,
@warn-color: @colortheme_whiteboard-warn,
@color: @colortheme_whiteboard-color
);
// body
&.cp-app-whiteboard {
.framework_main(
@bg-color: @colortheme_whiteboard-bg,
@warn-color: @colortheme_whiteboard-warn,
@color: @colortheme_whiteboard-color
);
display: flex;
flex-flow: column;
height: 100%;

View File

@@ -15,6 +15,7 @@ define([
'/bower_components/chainpad/chainpad.dist.js',
'/bower_components/secure-fabric.js/dist/fabric.min.js',
'less!/whiteboard/app-whiteboard.less'
], function (
$,
Sortify,