PLT-1121: One element, non-ordered lists and one element, ordered, nested lists aren't rendered correctly

web/react/utils/markdown.jsx

@@ -361,24 +361,22 @@ class MattermostLexer extends marked.Lexer {
             // list
             cap = this.rules.list.exec(src);
             if (cap) {
+                src = src.substring(cap[0].length);
                 const bull = cap[2];
-                let l = cap[0].length;
-
-                // Get each top-level item.
-                cap = cap[0].match(this.rules.item);
-
-                if (cap.length > 1) {
-                    src = src.substring(l);
 
                 this.tokens.push({
                     type: 'list_start',
                     ordered: bull.length > 1
                 });
 
-                    let next = false;
+                // Get each top-level item.
-                    l = cap.length;
+                cap = cap[0].match(this.rules.item);
 
-                    for (let i = 0; i < l; i++) {
+                let next = false;
+                const l = cap.length;
+                let i = 0;
+
+                for (; i < l; i++) {
                     let item = cap[i];
 
                     // Remove the list item's bullet
@@ -390,14 +388,15 @@ class MattermostLexer extends marked.Lexer {
                     // list item contains. Hacky.
                     if (~item.indexOf('\n ')) {
                         space -= item.length;
-                            item = this.options.pedantic ? item.replace(/^ {1,4}/gm, '') : item.replace(new RegExp('^ \{1,' + space + '\}', 'gm'), '');
+                        item = this.options.pedantic ?
+                            item.replace(/^ {1,4}/gm, '') :
+                            item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '');
                     }
 
                     // Determine whether the next list item belongs here.
                     // Backpedal if it does not belong in this list.
                     if (this.options.smartLists && i !== l - 1) {
-                            const bullet = /(?:[*+-]|\d+\.)/;
+                        const b = this.rules.bullet.exec(cap[i + 1])[0];
-                            const b = bullet.exec(cap[i + 1])[0];
                         if (bull !== b && !(bull.length > 1 && b.length > 1)) {
                             src = cap.slice(i + 1).join('\n') + src;
                             i = l - 1;
@@ -416,7 +415,9 @@ class MattermostLexer extends marked.Lexer {
                     }
 
                     this.tokens.push({
-                            type: loose ? 'loose_item_start' : 'list_item_start'
+                        type: loose ?
+                            'loose_item_start' :
+                            'list_item_start'
                     });
 
                     // Recurse.
@@ -433,7 +434,6 @@ class MattermostLexer extends marked.Lexer {
 
                 continue;
             }
-            }
 
             // html
             cap = this.rules.html.exec(src);

web/sass-files/sass/partials/_post.scss

@@ -374,9 +374,9 @@ body.ios {
 	ul {
 		margin: 0;
 		padding: 0;
-		list-style: none;
 	}
 
+
 	p {
 		margin: 0 0 1em;
 		line-height: 1.6em;
@@ -603,6 +603,11 @@ body.ios {
 			padding: 5px 0 0 20px;
 		}
 
+		ul, ol {
+			li ul, li ol {
+				padding: 0 0 0 20px
+			}
+		}
 	}
 
 	.post__link {