Fixed bullet styles and added code highlight on comments

diff --git a/resources/assets/js/code.js b/resources/assets/js/code.js
index 04f4c5d521c5c8446d17d0346c52cbedc98f1932..8a5a7a022d1b617d14f1106d794eaf8f2d8bfc8a 100644 (file)
--- 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() {
  * 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]);
     }
     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(/<br\s*[\/]?>/gi ,'\n');
         mode = getMode(langName);
     }
     elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');

-    let content = elem.textContent;
+    let content = elem.textContent.trim();

 
     CodeMirror(function(elt) {
         elem.parentNode.replaceChild(elt, elem);
 
     CodeMirror(function(elt) {
         elem.parentNode.replaceChild(elt, elem);

diff --git a/resources/assets/sass/_components.scss b/resources/assets/sass/_components.scss
index 2512abc7699d1021b9e1225f2f4747f1e420dee9..54e109067098bce3608526227ee8918e0348b390 100644 (file)
--- 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 {
     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;
   }
   .reply-row {
     padding: $-xs $-s;