From fb192a2c457594f20a9583120826475468eb61ae Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 31 Jan 2018 14:42:34 +0100 Subject: [PATCH] Add a configurable background color in the file app in view mode --- www/common/application_config_internal.js | 5 +++++ www/file/inner.js | 2 ++ www/pad/inner.js | 7 +++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js index 24c46b790..91520c99a 100644 --- a/www/common/application_config_internal.js +++ b/www/common/application_config_internal.js @@ -42,6 +42,11 @@ define(function() { '#800080', // purple ]; + // Background color in the apps with centered content: + // - file app in view mode + // - rich text app when editor's width reduced in settings + config.appBackgroundColor = '#666'; + // Set enableTemplates to false to remove the button allowing users to save a pad as a template // and remove the template category in CryptDrive config.enableTemplates = true; diff --git a/www/file/inner.js b/www/file/inner.js index 2dbe765ce..b4b327998 100644 --- a/www/file/inner.js +++ b/www/file/inner.js @@ -224,6 +224,8 @@ define([ if (decrypting) { return; } decrypting = true; displayFile(ev, sizeMb, function (err) { + $appContainer.css('background-color', + common.getAppConfig().appBackgroundColor); if (err) { UI.alert(err); } }); }; diff --git a/www/pad/inner.js b/www/pad/inner.js index b54dd7dd3..6945f6d45 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -31,6 +31,7 @@ define([ '/common/common-hash.js', '/common/common-util.js', '/bower_components/chainpad/chainpad.dist.js', + '/customize/application_config.js', '/bower_components/diff-dom/diffDOM.js', @@ -50,7 +51,8 @@ define([ ApiConfig, Hash, Util, - ChainPad) + ChainPad, + AppConfig) { var DiffDom = window.diffDOM; @@ -592,7 +594,8 @@ define([ } // Used in ckeditor-config.js Ckeditor.CRYPTPAD_URLARGS = ApiConfig.requireConf.urlArgs; - var newCss = '.cke_body_width { background: #666; height: 100%; }' + + var backColor = AppConfig.appBackgroundColor; + var newCss = '.cke_body_width { background: '+ backColor +'; height: 100%; }' + '.cke_body_width body {' + 'max-width: 50em; padding: 10px 30px; margin: 0 auto; min-height: 100%;'+ 'box-sizing: border-box;'+