From 55a92e5c2da49985e4822684af511efe87e301ef Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine <arnaud.fontaine@nexedi.com> Date: Fri, 26 Dec 2014 17:55:18 +0900 Subject: [PATCH] erp5_code_mirror: Fix layout of warnings/errors div to make it consistent with maximize info div. --- .../portal_skins/erp5_code_mirror/code_mirror_support.xml | 8 ++++---- bt5/erp5_code_mirror/bt/change_log | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/code_mirror_support.xml b/bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/code_mirror_support.xml index 406cd9ac24..b872527a4c 100644 --- a/bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/code_mirror_support.xml +++ b/bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/code_mirror_support.xml @@ -70,9 +70,9 @@ position: absolute;\n bottom: 0;\n right: 20px;\n - width: 40%;\n + max-width: 40%;\n z-index: 424242;\n - padding: 20px;\n + padding: 10px;\n background-color: #DAE6F6;\n border: 1px solid #97B0D1;\n opacity: 0.3;\n @@ -139,7 +139,7 @@ merge_mode_elem = null;\n \n maximize_mode_message = $(\'<span id="maximize_message">Press ESC to leave maximize mode</span>\');\n - \n +\n function maximizeFullscreenRemoveSaveMessage() {\n $(\'.maximize_fullscreen_message\').remove();\n }\n @@ -255,7 +255,7 @@ msg_elem = $(\'<div class="\' + msg_elem_classes + \'"\' +\n \'<div>\' + maximize_fullscreen_message + \'</div></div>\');\n \n - msg_elem.appendTo(cm.getWrapperElement());\n + $(\'body\').prepend(msg_elem);\n \n function animateMessageComplete() {\n if(!error_arr.length && !warning_arr.length)\n diff --git a/bt5/erp5_code_mirror/bt/change_log b/bt5/erp5_code_mirror/bt/change_log index 09bb073bb3..584f86038b 100644 --- a/bt5/erp5_code_mirror/bt/change_log +++ b/bt5/erp5_code_mirror/bt/change_log @@ -1,3 +1,6 @@ +2014-12-26 arnaud.fontaine +* Fix layout of warnings/errors div to make it consistent with maximize info div. + 2014-12-26 arnaud.fontaine * Fix warning/error messages div not being displayed in maximize mode. -- 2.30.9