From 3c1b1a615da0941c7d86c0995fcee4a63951fd73 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 4 Nov 2024 10:07:06 -0600 Subject: [PATCH 1/2] change style of admon titles --- .../lib/docbook_compat/convert_admonition.rb | 4 ++-- resources/web/style/admonishment.pcss | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/asciidoctor/lib/docbook_compat/convert_admonition.rb b/resources/asciidoctor/lib/docbook_compat/convert_admonition.rb index 188bf75c56467..7b4fb4a6ed55e 100644 --- a/resources/asciidoctor/lib/docbook_compat/convert_admonition.rb +++ b/resources/asciidoctor/lib/docbook_compat/convert_admonition.rb @@ -20,10 +20,10 @@ def convert_admonition_title_id(node) return node.id ? %() : nil unless node.title [ - '

', + '

', node.title, node.id ? %() : nil, - '

', + '

', ].compact.join end diff --git a/resources/web/style/admonishment.pcss b/resources/web/style/admonishment.pcss index 8fa20318458da..9ad227cd23838 100644 --- a/resources/web/style/admonishment.pcss +++ b/resources/web/style/admonishment.pcss @@ -84,14 +84,14 @@ } .admon_content { - margin-left: 80px; + margin-left: 100px; /* On page load, the heading level may be changed, but we always what to style it the same way */ - h2, h3, h4, h5, h6 { - margin: 3px 0; - font-size: 22px; - font-weight: 600; - a { font-weight: 600; } + .admon_title { + font-size: 16px; + margin-bottom: 4px; + font-weight: 700; + a { font-weight: 700; } } p:last-of-type { margin-bottom: 0em; From dbeec4c5161c2abced30c426f464c6a3b3f3a1e0 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 6 Nov 2024 15:01:09 -0600 Subject: [PATCH 2/2] fix tests --- resources/asciidoctor/spec/change_admonition_spec.rb | 4 ++-- resources/asciidoctor/spec/docbook_compat_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/asciidoctor/spec/change_admonition_spec.rb b/resources/asciidoctor/spec/change_admonition_spec.rb index 6d06b0930cc68..db13a31db1cd2 100644 --- a/resources/asciidoctor/spec/change_admonition_spec.rb +++ b/resources/asciidoctor/spec/change_admonition_spec.rb @@ -35,7 +35,7 @@ def expect_block_admonition(body) end it "renders with Elastic's custom template" do expect_block_admonition <<~HTML.strip -

#{message} in 7.0.0-beta1.

+

#{message} in 7.0.0-beta1.

words

HTML end @@ -58,7 +58,7 @@ def expect_block_admonition(body) end it "renders with Elastic's custom template" do expect_block_admonition <<~HTML.strip -

#{message} in 7.0.0-beta1.

+

#{message} in 7.0.0-beta1.

Like 27

HTML end diff --git a/resources/asciidoctor/spec/docbook_compat_spec.rb b/resources/asciidoctor/spec/docbook_compat_spec.rb index 0fb4f34222eb1..2790fced2f6a9 100644 --- a/resources/asciidoctor/spec/docbook_compat_spec.rb +++ b/resources/asciidoctor/spec/docbook_compat_spec.rb @@ -1915,7 +1915,7 @@ def expect_block_admonition(body)
-

Title

+

Title

words

@@ -1938,7 +1938,7 @@ def expect_block_admonition(body)
-

Title

+

Title

words