Merge branch 'master' into Template-Changes

1 files changed, 2 insertions, 4 deletions

diff --git a/src/client/views/nodes/formattedText/nodes_rts.ts b/src/client/views/nodes/formattedText/nodes_rts.ts
index 02ded3103..5d34afc8a 100644
--- a/src/client/views/nodes/formattedText/nodes_rts.ts
+++ b/src/client/views/nodes/formattedText/nodes_rts.ts
@@ -353,6 +353,7 @@ export const nodes: { [index: string]: NodeSpec } = {
     hard_break: {
         inline: true,
         group: 'inline',
+        marks: '_',
         selectable: false,
         parseDOM: [{ tag: 'br' }],
         toDOM() {
@@ -386,10 +387,6 @@ export const nodes: { [index: string]: NodeSpec } = {
                 },
             },
             {
-                style: 'list-style-type=disc',
-                getAttrs: () => ({ mapStyle: 'bullet' }),
-            },
-            {
                 tag: 'ol',
                 getAttrs: dom => {
                     return {
@@ -443,6 +440,7 @@ export const nodes: { [index: string]: NodeSpec } = {
             mapStyle: { default: 'decimal' }, // "decimal", "multi", "bullet"
             visibility: { default: true },
         },
+        marks: '_',
         content: '(paragraph|audiotag)+ | ((paragraph|audiotag)+ ordered_list)',
         parseDOM: [
             {