From 991f7fc3b88994f10a15dfcd45ffb9f41cc1988f Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Thu, 13 Oct 2016 06:35:34 +1100 Subject: [PATCH] Fixes styling formatted content as raw Refs #2390 --- .../system/assets/css/eventlogs/exception-beautifier.css | 9 ++++++--- .../system/assets/js/eventlogs/exception-beautifier.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/system/assets/css/eventlogs/exception-beautifier.css b/modules/system/assets/css/eventlogs/exception-beautifier.css index 60c26a87d..0307ffbc5 100644 --- a/modules/system/assets/css/eventlogs/exception-beautifier.css +++ b/modules/system/assets/css/eventlogs/exception-beautifier.css @@ -115,14 +115,17 @@ color: #2196F3; } +.plugin-exception-beautifier .beautifier-formatted-content, .plugin-exception-beautifier .beautifier-raw-content { background: #fff; - font-family: monospace; padding: 20px; - white-space: nowrap; +} - width: 100%; +.plugin-exception-beautifier .beautifier-raw-content { + font-family: monospace; + white-space: nowrap; overflow: auto; + width: 100%; } .plugin-exception-beautifier .beautifier-raw-content br { diff --git a/modules/system/assets/js/eventlogs/exception-beautifier.js b/modules/system/assets/js/eventlogs/exception-beautifier.js index 2eff039e3..8353aa62f 100644 --- a/modules/system/assets/js/eventlogs/exception-beautifier.js +++ b/modules/system/assets/js/eventlogs/exception-beautifier.js @@ -325,7 +325,7 @@ '') if (source.indexOf('Message-ID:') > 0) { - markup = '
' + source.trim().replace(/\r\n|\r|\n/g, '
').replace(/ {2}/g, '  ') + '
' + markup = '
' + source.trim().replace(/\r\n|\r|\n/g, '
').replace(/ {2}/g, '  ') + '
' } tabs.find('#beautifier-tab-formatted').append(markup)