From 204e45dfae87616e2b572cdb3e0a6e7a8b8066b3 Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 5 Sep 2017 11:57:44 +0200 Subject: [PATCH] Enable templates in pad --- customize.dist/src/less2/include/icon-colors.less | 2 +- www/code/index.html | 1 - www/filepicker/app-filepicker.less | 2 ++ www/pad/index.html | 10 +++++++++- www/pad/inner.js | 7 ++++++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/customize.dist/src/less2/include/icon-colors.less b/customize.dist/src/less2/include/icon-colors.less index f3fadd191..345a48a9a 100644 --- a/customize.dist/src/less2/include/icon-colors.less +++ b/customize.dist/src/less2/include/icon-colors.less @@ -6,7 +6,7 @@ .cp-icon-color-slide { color: @colortheme_slide-bg; } .cp-icon-color-poll { color: @colortheme_poll-bg; } .cp-icon-color-file { color: @colortheme_file-bg; } - .cp-icon-color-friends { color: @colortheme_friends-bg; } + .cp-icon-color-contacts { color: @colortheme_friends-bg; } .cp-icon-color-whiteboard { color: @colortheme_whiteboard-bg; } .cp-icon-color-drive { color: @colortheme_drive-bg; } .cp-icon-color-settings { color: @colortheme_settings-bg; } diff --git a/www/code/index.html b/www/code/index.html index a564c32b7..e3f7eacc4 100644 --- a/www/code/index.html +++ b/www/code/index.html @@ -32,7 +32,6 @@ height: 100%; border: 0; } - diff --git a/www/filepicker/app-filepicker.less b/www/filepicker/app-filepicker.less index e18d3e39f..2aca46cb5 100644 --- a/www/filepicker/app-filepicker.less +++ b/www/filepicker/app-filepicker.less @@ -2,9 +2,11 @@ @import (once) '../../customize/src/less2/include/modal.less'; @import (once) '../../customize/src/less2/include/icon-colors.less'; @import (once) '../../customize/src/less2/include/fileupload.less'; +@import (once) '../../customize/src/less2/include/alertify.less'; .iconColors_main(); .fileupload_main(); +.alertify_main(); #cp-filepicker-dialog { display: none; diff --git a/www/pad/index.html b/www/pad/index.html index 8be90cfb5..e3f7eacc4 100644 --- a/www/pad/index.html +++ b/www/pad/index.html @@ -24,7 +24,15 @@ padding:0; overflow:hidden; } + #sbox-filePicker-iframe { + position: fixed; + top:0; left:0; + bottom:0; right:0; + width:100%; + height: 100%; + border: 0; + } -