# HG changeset patch # User Paul Boddie # Date 1562535862 -7200 # Node ID 26b69878653484a809ff62450eeca20c15c6eeb1 # Parent f2e0284e93d46a9afefb6eb453e5d5b33ee1fd48# Parent c06fecd921b80610f6d49b0f0e9b43b273b9e797 Merged changes from the default branch. diff -r f2e0284e93d4 -r 26b698786534 moinformat/themes/mercurial/css/all.css --- a/moinformat/themes/mercurial/css/all.css Mon Jul 01 22:30:28 2019 +0200 +++ b/moinformat/themes/mercurial/css/all.css Sun Jul 07 23:44:22 2019 +0200 @@ -52,11 +52,6 @@ border: 1pt solid #ADB9CC; } -td p { - margin: 0; - padding: 0; -} - /* Preformatted text. */ pre { diff -r f2e0284e93d4 -r 26b698786534 moinformat/tree/moin.py --- a/moinformat/tree/moin.py Mon Jul 01 22:30:28 2019 +0200 +++ b/moinformat/tree/moin.py Sun Jul 07 23:44:22 2019 +0200 @@ -64,7 +64,12 @@ "Return the container to which inline nodes are added." - return self + last = self.node(-1) + + if isinstance(last, Block): + return last + else: + return self def empty(self): return not self.nodes