diff options
| author | Dan Allen <dan.j.allen@gmail.com> | 2022-10-13 03:22:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 03:22:15 -0600 |
| commit | f80441fd2ad46439cce19bf54581eb9d79097f3d (patch) | |
| tree | 1d2d82e7f41f7027da000522bc585de541b6515d | |
| parent | f22e09c1ebda573215a9d687fde9f501da6759c5 (diff) | |
resolves #4361 honor marker on unordered list when marker is defined on ancestor unordered list (PR #4367)
| -rw-r--r-- | CHANGELOG.adoc | 1 | ||||
| -rw-r--r-- | data/stylesheets/asciidoctor-default.css | 4 | ||||
| -rw-r--r-- | src/stylesheets/asciidoctor.css | 20 |
3 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index ad613dc3..95bc38df 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -68,6 +68,7 @@ Bug Fixes:: * Format source location in exception message when extension code is malformed * Fix lineno on reader when `skip-front-matter` attribute is set but end of front matter is not found * Fix `Asciidoctor::Cli::Invoker` constructor when first argument is a hash + * Update default stylesheet to honor marker on unordered list when marker is defined on ancestor unordered list (#4361) // tag::compact[] == 2.0.17 (2022-01-05) - @mojavelinux diff --git a/data/stylesheets/asciidoctor-default.css b/data/stylesheets/asciidoctor-default.css index e5fb0d54..d806f313 100644 --- a/data/stylesheets/asciidoctor-default.css +++ b/data/stylesheets/asciidoctor-default.css @@ -53,10 +53,10 @@ h6{font-size:1em} ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit} ul,ol{margin-left:1.5em} ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0} -ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit} -ul.square{list-style-type:square} ul.circle{list-style-type:circle} ul.disc{list-style-type:disc} +ul.square{list-style-type:square} +ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit} ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0} dl dt{margin-bottom:.3125em;font-weight:bold} dl dd{margin-bottom:1.25em;margin-left:1.125em} diff --git a/src/stylesheets/asciidoctor.css b/src/stylesheets/asciidoctor.css index b002a676..21cc3bc9 100644 --- a/src/stylesheets/asciidoctor.css +++ b/src/stylesheets/asciidoctor.css @@ -338,16 +338,6 @@ ul li ol { margin-bottom: 0; } -ul.square li ul, -ul.circle li ul, -ul.disc li ul { - list-style: inherit; -} - -ul.square { - list-style-type: square; -} - ul.circle { list-style-type: circle; } @@ -356,6 +346,16 @@ ul.disc { list-style-type: disc; } +ul.square { + list-style-type: square; +} + +ul.circle ul:not([class]), +ul.disc ul:not([class]), +ul.square ul:not([class]) { + list-style: inherit; +} + ol li ul, ol li ol { margin-left: 1.25em; |