From ec303c2c36b7bf88c5e5d3395728ea952b7594e6 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 29 Oct 2024 08:55:42 -0500 Subject: [PATCH 1/9] add serverless book --- conf.yaml | 22 ++++++++++++++++++++++ doc_build_aliases.sh | 3 +++ 2 files changed, 25 insertions(+) diff --git a/conf.yaml b/conf.yaml index 6708903d5b65..a34f2bab5696 100644 --- a/conf.yaml +++ b/conf.yaml @@ -124,6 +124,28 @@ variables: toc_extra: extra/docs_landing.html contents: + - title: Serverless + sections: + - title: Serverless + prefix: en/serverless + current: mdx-to-asciidoc + branches: [ mdx-to-asciidoc ] + live: [ mdx-to-asciidoc ] + index: serverless/index.asciidoc + chunk: 5 + tags: Serverless/Guide + subject: Serverless + sources: + - + repo: docs-content + path: docs/serverless + - + repo: observability-docs + path: docs/en/serverless + - + repo: security-docs + path: docs/serverless + - title: Search sections: - title: Elasticsearch Guide diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 698c298018e4..0d201e7a7f38 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -9,6 +9,9 @@ # source $GIT_HOME/docs/doc_build_aliases.sh # +# Serverless +alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/serverless/index.asciidoc --chunk 5 --open --resource $GIT_HOME/observability-docs/docs/en/serverless --resource $GIT_HOME/security-docs/docs/serverless --resource $GIT_HOME/docs-content/serverless' + # Elasticsearch alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' From e580839f10e42e85cfb358acc85f8d9fdf75cf1d Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 29 Oct 2024 11:48:52 -0500 Subject: [PATCH 2/9] add docs-content repo to repo list --- conf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conf.yaml b/conf.yaml index a34f2bab5696..1d8a2c2b3325 100644 --- a/conf.yaml +++ b/conf.yaml @@ -19,6 +19,7 @@ repos: cloud-assets: https://github.com/elastic/cloud-assets.git cloud-on-k8s: https://github.com/elastic/cloud-on-k8s.git curator: https://github.com/elastic/curator.git + docs-content: https://github.com/elastic/docs-content.git ecctl: https://github.com/elastic/ecctl.git ecs: https://github.com/elastic/ecs.git ecs-dotnet: https://github.com/elastic/ecs-dotnet.git From e26c966030d347c551e0e16bb91637fcb6349b17 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 29 Oct 2024 12:02:01 -0500 Subject: [PATCH 3/9] fix docs-content path --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 1d8a2c2b3325..cff7af7da0d9 100644 --- a/conf.yaml +++ b/conf.yaml @@ -139,7 +139,7 @@ contents: sources: - repo: docs-content - path: docs/serverless + path: serverless - repo: observability-docs path: docs/en/serverless From b0a26a1e2ddab77f0d5f80e39758a1b14f289d79 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 29 Oct 2024 08:55:42 -0500 Subject: [PATCH 4/9] add serverless book --- conf.yaml | 22 ++++++++++++++++++++++ doc_build_aliases.sh | 3 +++ 2 files changed, 25 insertions(+) diff --git a/conf.yaml b/conf.yaml index 83ed6fb139e7..82885a4f6e31 100644 --- a/conf.yaml +++ b/conf.yaml @@ -124,6 +124,28 @@ variables: toc_extra: extra/docs_landing.html contents: + - title: Serverless + sections: + - title: Serverless + prefix: en/serverless + current: mdx-to-asciidoc + branches: [ mdx-to-asciidoc ] + live: [ mdx-to-asciidoc ] + index: serverless/index.asciidoc + chunk: 5 + tags: Serverless/Guide + subject: Serverless + sources: + - + repo: docs-content + path: docs/serverless + - + repo: observability-docs + path: docs/en/serverless + - + repo: security-docs + path: docs/serverless + - title: Search sections: - title: Elasticsearch Guide diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 698c298018e4..0d201e7a7f38 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -9,6 +9,9 @@ # source $GIT_HOME/docs/doc_build_aliases.sh # +# Serverless +alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/serverless/index.asciidoc --chunk 5 --open --resource $GIT_HOME/observability-docs/docs/en/serverless --resource $GIT_HOME/security-docs/docs/serverless --resource $GIT_HOME/docs-content/serverless' + # Elasticsearch alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' From 5359605d8f33d48628501c3ca8e60d22fe5e1338 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 29 Oct 2024 11:48:52 -0500 Subject: [PATCH 5/9] add docs-content repo to repo list --- conf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conf.yaml b/conf.yaml index 82885a4f6e31..30be3da945b8 100644 --- a/conf.yaml +++ b/conf.yaml @@ -19,6 +19,7 @@ repos: cloud-assets: https://github.com/elastic/cloud-assets.git cloud-on-k8s: https://github.com/elastic/cloud-on-k8s.git curator: https://github.com/elastic/curator.git + docs-content: https://github.com/elastic/docs-content.git ecctl: https://github.com/elastic/ecctl.git ecs: https://github.com/elastic/ecs.git ecs-dotnet: https://github.com/elastic/ecs-dotnet.git From 47d9fe111b623122c20f85373096473c712297cb Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 29 Oct 2024 12:02:01 -0500 Subject: [PATCH 6/9] fix docs-content path --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 30be3da945b8..d30647d8cb5d 100644 --- a/conf.yaml +++ b/conf.yaml @@ -139,7 +139,7 @@ contents: sources: - repo: docs-content - path: docs/serverless + path: serverless - repo: observability-docs path: docs/en/serverless From 284484eb0b2e35bdee39782ae5beb100b4bf0616 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 4 Nov 2024 10:07:06 -0600 Subject: [PATCH 7/9] 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 188bf75c5646..7b4fb4a6ed55 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 8fa20318458d..9ad227cd2383 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 a503d6a11eb9f0f9f9e01b498530d0e6b3568e71 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 4 Nov 2024 13:09:21 -0600 Subject: [PATCH 8/9] Revert "change style of admon titles" This reverts commit 284484eb0b2e35bdee39782ae5beb100b4bf0616. --- .../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 7b4fb4a6ed55..188bf75c5646 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 9ad227cd2383..8fa20318458d 100644 --- a/resources/web/style/admonishment.pcss +++ b/resources/web/style/admonishment.pcss @@ -84,14 +84,14 @@ } .admon_content { - margin-left: 100px; + margin-left: 80px; /* On page load, the heading level may be changed, but we always what to style it the same way */ - .admon_title { - font-size: 16px; - margin-bottom: 4px; - font-weight: 700; - a { font-weight: 700; } + h2, h3, h4, h5, h6 { + margin: 3px 0; + font-size: 22px; + font-weight: 600; + a { font-weight: 600; } } p:last-of-type { margin-bottom: 0em; From f4f4634bd609cb3ee329bcece4dd21f122902bc2 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 5 Nov 2024 11:26:21 -0600 Subject: [PATCH 9/9] update to main --- conf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index 105a624c184d..b79046d85e32 100644 --- a/conf.yaml +++ b/conf.yaml @@ -129,9 +129,9 @@ contents: sections: - title: Serverless prefix: en/serverless - current: mdx-to-asciidoc - branches: [ mdx-to-asciidoc ] - live: [ mdx-to-asciidoc ] + current: main + branches: [ main ] + live: [ main ] index: serverless/index.asciidoc chunk: 5 tags: Serverless/Guide