From 96429f6e8d4a5e2ac6cf73ec8662152926dc214c Mon Sep 17 00:00:00 2001
From: John Fairhurst <johnfairh@gmail.com>
Date: Wed, 27 Nov 2019 13:27:47 +0000
Subject: [PATCH] Render bullet lists mixed with callouts (#1135)

---
 CHANGELOG.md                | 4 +++-
 lib/jazzy/jazzy_markdown.rb | 6 +++---
 spec/integration_specs      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac1d9b8dc..131059eca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,9 @@
 
 ##### Bug Fixes
 
-* None.
+* Render bullet lists correctly when followed by a callout.  
+  [John Fairhurst](https://github.com/johnfairh)
+  [#785](https://github.com/realm/jazzy/issues/785)
 
 ## 0.12.0
 
diff --git a/lib/jazzy/jazzy_markdown.rb b/lib/jazzy/jazzy_markdown.rb
index 3a2367f01..9f672cf8f 100644
--- a/lib/jazzy/jazzy_markdown.rb
+++ b/lib/jazzy/jazzy_markdown.rb
@@ -82,21 +82,21 @@ def list_item(text, _list_type)
 
       def render_aside(type, text)
         <<-HTML
-<div class="aside aside-#{type.underscore.tr('_', '-')}">
+</ul><div class="aside aside-#{type.underscore.tr('_', '-')}">
     <p class="aside-title">#{type.underscore.humanize}</p>
     #{text}
-</div>
+</div><ul>
         HTML
       end
 
       def list(text, list_type)
         elided = text.gsub!(ELIDED_LI_TOKEN, '')
         return if text =~ /\A\s*\Z/ && elided
-        return text if text =~ /class="aside-title"/
         str = "\n"
         str << (list_type == :ordered ? "<ol>\n" : "<ul>\n")
         str << text
         str << (list_type == :ordered ? "</ol>\n" : "</ul>\n")
+        str.gsub(%r{\n?<ul>\n<\/ul>}, '')
       end
 
       def block_code(code, language)
diff --git a/spec/integration_specs b/spec/integration_specs
index 155aeceeb..20747de23 160000
--- a/spec/integration_specs
+++ b/spec/integration_specs
@@ -1 +1 @@
-Subproject commit 155aeceebf0a8b54558a76b8aa189c2b0dc63768
+Subproject commit 20747de2351b10fd4d600e2e309b0367e30ea01c