From 9a3bc27ef4767fb7d3b992d25528bf9174f3b546 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 10 Sep 2017 16:14:04 +0100 Subject: [PATCH] Fixed bullet styles and added code highlight on comments --- resources/assets/js/code.js | 4 ++-- resources/assets/sass/_components.scss | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/code.js b/resources/assets/js/code.js index 04f4c5d52..8a5a7a022 100644 --- a/resources/assets/js/code.js +++ b/resources/assets/js/code.js @@ -57,7 +57,7 @@ const modeMap = { * Highlight pre elements on a page */ function highlight() { - let codeBlocks = document.querySelectorAll('.page-content pre'); + let codeBlocks = document.querySelectorAll('.page-content pre, .comment-box .content pre'); for (let i = 0; i < codeBlocks.length; i++) { highlightElem(codeBlocks[i]); } @@ -75,7 +75,7 @@ function highlightElem(elem) { mode = getMode(langName); } elem.innerHTML = elem.innerHTML.replace(//gi ,'\n'); - let content = elem.textContent; + let content = elem.textContent.trim(); CodeMirror(function(elt) { elem.parentNode.replaceChild(elt, elem); diff --git a/resources/assets/sass/_components.scss b/resources/assets/sass/_components.scss index 2512abc76..54e109067 100644 --- a/resources/assets/sass/_components.scss +++ b/resources/assets/sass/_components.scss @@ -549,10 +549,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group { .content { padding: $-s; font-size: 0.666em; - } - .content p { - font-size: $fs-m; - margin: .5em 0; + p, ul { + font-size: $fs-m; + margin: .5em 0; + } } .reply-row { padding: $-xs $-s;