Merge branch 'creationpage' into staging

2017-12-11 12:21:21 +01:00
parent 353b146644 1922dbfd75
commit dcfccf88cd
14 changed files with 483 additions and 44 deletions
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -4,6 +4,7 @@
@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';

 .toolbar_main(
    @bg-color: @colortheme_code-bg,
@@ -13,6 +14,7 @@
 .fileupload_main();
 .alertify_main();
 .tokenfield_main();
+.creation_main();

 // body
 &.cp-app-code {