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

resolve merge conflicts

Browse Source
This commit is contained in:
ansuz
2017-10-02 18:59:47 +02:00
parent 6c7b135f91 0f9e93e1de
commit 351b95d6a9
83 changed files with 10263 additions and 3812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
customize.dist/src/less2/main.less
View File

@@ -22,10 +22,13 @@ html.cp-app-print {
.app-print_main();
}
body.cp-app-drive { @import "../../../drive/app-drive.less"; }
body.cp-app-pad { @import "../../../pad/app-pad.less"; }
body.cp-app-code { @import "../../../code/app-code.less"; }
body.cp-app-slide { @import "../../../slide/app-slide.less"; }
body.cp-app-file { @import "../../../file/app-file.less"; }
body.cp-app-filepicker { @import "../../../filepicker/app-filepicker.less"; }
body.cp-app-contacts { @import "../../../contacts/app-contacts.less"; }
//body.cp-app-poll { @import "../../../poll/app-poll.less"; }
body.cp-app-whiteboard { @import "../../../whiteboard/app-whiteboard.less"; }