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

Merge branch 'newdrive' into staging

Browse Source
This commit is contained in:
yflory
2017-09-27 10:28:16 +02:00
parent 767027b237 cdeac00633
commit b4de31c827
38 changed files with 4447 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/whiteboard/app-whiteboard.less
View File

@@ -3,6 +3,7 @@
@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/tools.less';
.toolbar_main();
.fileupload_main();
@@ -37,12 +38,7 @@
}
.cp-app-whiteboard-unselectable {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
.tools_unselectable();
}
// contains user tools

2
www/whiteboard/inner.html
View File

@@ -2,7 +2,7 @@
<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<script async data-bootload="/whiteboard/inner.js" data-main="/common/sframe-boot.js?ver=1.5" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<script async data-bootload="/whiteboard/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<style>
.loading-hidden { display: none; }
#editor1 { display: none; }