From bca8303606ca45617a1b69db9c115cb129bca8a9 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 12 Nov 2024 13:49:51 -0600 Subject: [PATCH 01/10] update details style --- resources/web/style/base_styles.pcss | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/resources/web/style/base_styles.pcss b/resources/web/style/base_styles.pcss index 78735f5f98820..ffd679ea7d600 100644 --- a/resources/web/style/base_styles.pcss +++ b/resources/web/style/base_styles.pcss @@ -28,7 +28,35 @@ } details { + background-color: #F1F4FA; margin-bottom: 1.15em; + border: 1px #D3DAE6 solid; + border-radius: 3px; + summary { + list-style-type: none; + display: inline-block; + width: 100%; + padding: 10px; + &:before { + content: url('data:image/svg+xml;utf8,'); + display: inline-block; + transform: translate(0px, 3.5px) rotate(0deg); + transition: .1s ease-in-out; + margin-right: 8px; + } + } + .content { + padding: 5px 20px 0px 36px; + } + } + + details[open] { + summary { + &:before { + transform: translate(-3.5px, 0px) rotate(90deg); + transition: .1s ease-in-out; + } + } } .container-fluid { From 23b16d5ca212d41a9249a68390eb10d9bf4c11df Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 12 Nov 2024 13:51:00 -0600 Subject: [PATCH 02/10] add build alias --- doc_build_aliases.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 36514b7b3fe15..200c0bf75916d 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -12,6 +12,9 @@ # Serverless alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/serverless/index.asciidoc --chunk 5 --resource $GIT_HOME/observability-docs/docs/en/serverless --resource $GIT_HOME/security-docs/docs/serverless --resource $GIT_HOME/docs-content/serverless' +# Integrations +alias docbldintegration='$GIT_HOME/docs/build_docs --doc $GIT_HOME/integration-docs/dist/index.asciidoc --chunk 2 --open' + # Elasticsearch alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' From 606dddb49041ee7ab01ae19e4f3b115aa14c657b Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 18 Nov 2024 09:01:40 -0600 Subject: [PATCH 03/10] update config --- conf.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/conf.yaml b/conf.yaml index d452d60351a2e..d5fd752f7b507 100644 --- a/conf.yaml +++ b/conf.yaml @@ -125,6 +125,22 @@ variables: toc_extra: extra/docs_landing.html contents: + - title: Integrations + sections: + - title: Integrations + prefix: en/integrations + current: pre-mdx-to-asciidoc + branches: [ pre-mdx-to-asciidoc ] + live: [ pre-mdx-to-asciidoc ] + index: dist/index.asciidoc + chunk: 2 + private: 1 + tags: Integrations/Reference + subject: Integrations + sources: + - + repo: integrations + path: dist - title: Serverless sections: - title: Serverless From 161874bbefd83d8f1a5792327377fbfde99ff2e9 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 18 Nov 2024 09:25:02 -0600 Subject: [PATCH 04/10] add icons --- resources/web/style/icons.pcss | 14 ++++++++++++++ resources/web/style/img/icons/bug.svg | 3 +++ .../web/style/img/icons/checkInCircleFilled.svg | 3 +++ resources/web/style/img/icons/warningFilled.svg | 3 +++ resources/web/styles-v1.pcss | 1 + shared/attributes.asciidoc | 7 +++++++ 6 files changed, 31 insertions(+) create mode 100644 resources/web/style/icons.pcss create mode 100644 resources/web/style/img/icons/bug.svg create mode 100644 resources/web/style/img/icons/checkInCircleFilled.svg create mode 100644 resources/web/style/img/icons/warningFilled.svg diff --git a/resources/web/style/icons.pcss b/resources/web/style/icons.pcss new file mode 100644 index 0000000000000..3426f18767f17 --- /dev/null +++ b/resources/web/style/icons.pcss @@ -0,0 +1,14 @@ +#guide { + .eui-icon { + background-repeat: no-repeat; + background-position: 0 0; + background-size: contain; + display: inline-block; + width: 16px; + height: 16px; + vertical-align: middle; + &.icon-bug { background-image: inline("img/icons/bug.svg"); } + &.icon-checkInCircleFilled { background-image: inline("img/icons/checkInCircleFilled.svg"); } + &.icon-warningFilled { background-image: inline("img/icons/warningFilled.svg"); } + } +} \ No newline at end of file diff --git a/resources/web/style/img/icons/bug.svg b/resources/web/style/img/icons/bug.svg new file mode 100644 index 0000000000000..19ee985ad0744 --- /dev/null +++ b/resources/web/style/img/icons/bug.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/web/style/img/icons/checkInCircleFilled.svg b/resources/web/style/img/icons/checkInCircleFilled.svg new file mode 100644 index 0000000000000..410cd1cd61b82 --- /dev/null +++ b/resources/web/style/img/icons/checkInCircleFilled.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/web/style/img/icons/warningFilled.svg b/resources/web/style/img/icons/warningFilled.svg new file mode 100644 index 0000000000000..d9952fd2a6408 --- /dev/null +++ b/resources/web/style/img/icons/warningFilled.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/web/styles-v1.pcss b/resources/web/styles-v1.pcss index 0a1c72bd0f7cc..7cfc1c28fad06 100644 --- a/resources/web/styles-v1.pcss +++ b/resources/web/styles-v1.pcss @@ -16,6 +16,7 @@ @import './style/example.pcss'; @import './style/feedback.pcss'; @import './style/heading.pcss'; +@import './style/icons.pcss'; @import './style/img.pcss'; @import './style/layout.pcss'; @import './style/link.pcss'; diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index f3b1925adb825..59dcc33974b07 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -569,3 +569,10 @@ Legacy definitions :apm-overview-ref-m: https://www.elastic.co/guide/en/apm/get-started/master :infra-guide: https://www.elastic.co/guide/en/infrastructure/guide/{branch} :a-data-source: a data view + +//// +UI icons and logos from EUI +//// +:icon-bug: pass:[] +:icon-checkInCircleFilled: pass:[] +:icon-warningFilled: pass:[] From 85ff881745159d104299de468c3b756ef58a0198 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 18 Nov 2024 11:27:50 -0600 Subject: [PATCH 05/10] add condensed table style --- resources/web/style/table.pcss | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/resources/web/style/table.pcss b/resources/web/style/table.pcss index fe4586a25ca86..3d4fed1679100 100644 --- a/resources/web/style/table.pcss +++ b/resources/web/style/table.pcss @@ -45,13 +45,16 @@ padding-left: 0.15em; } } - tr:last-child { - th, td { - border: none; + + tr { + &:last-child { + th, td { + border: none; + } } } - .monospaced { + .monospaced { td p, th { font-family: Consolas, Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Lucida Console", monospace; } @@ -93,4 +96,25 @@ vertical-align: middle; } } + + /** Used in integration docs */ + .condensed-table { + table { + tbody { + tr { + border-bottom: 1px solid #e5eae4; + &:first-child { + border-top: 1px solid #e5eae4!important; + } + td { + vertical-align: top; + padding: 0.6em; + } + p { + margin-bottom: 0px!important; + } + } + } + } + } } From 704d7a115b972de5b8090c855219d807a1ed0dae Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 18 Nov 2024 12:30:31 -0600 Subject: [PATCH 06/10] update conf.yaml --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index d5fd752f7b507..7ef4f6a1d7195 100644 --- a/conf.yaml +++ b/conf.yaml @@ -139,7 +139,7 @@ contents: subject: Integrations sources: - - repo: integrations + repo: integration-docs path: dist - title: Serverless sections: From 0281ce9e9b6551f77f0970f89591c9c67f999a24 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 18 Nov 2024 12:42:13 -0600 Subject: [PATCH 07/10] add integration-docs as a source repo --- conf.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 7ef4f6a1d7195..1f69cc4ea9953 100644 --- a/conf.yaml +++ b/conf.yaml @@ -55,6 +55,7 @@ repos: guide: https://github.com/elastic/elasticsearch-definitive-guide.git guide-cn: https://github.com/elasticsearch-cn/elasticsearch-definitive-guide.git ingest-docs: https://github.com/elastic/ingest-docs.git + integration-docs: https://github.com/elastic/integration-docs.git kibana: https://github.com/elastic/kibana.git kibana-cn: https://github.com/elasticsearch-cn/kibana.git logstash: https://github.com/elastic/logstash.git @@ -131,7 +132,7 @@ contents: prefix: en/integrations current: pre-mdx-to-asciidoc branches: [ pre-mdx-to-asciidoc ] - live: [ pre-mdx-to-asciidoc ] + live: [ pre-mdx-to-asciidoc ] index: dist/index.asciidoc chunk: 2 private: 1 From c9139b0d29190a1ad47a2649328719f4c1554f5c Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Mon, 18 Nov 2024 15:31:34 -0600 Subject: [PATCH 08/10] fix some styles --- resources/web/style/base_styles.pcss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/web/style/base_styles.pcss b/resources/web/style/base_styles.pcss index ffd679ea7d600..ccfca53dc8f80 100644 --- a/resources/web/style/base_styles.pcss +++ b/resources/web/style/base_styles.pcss @@ -28,7 +28,7 @@ } details { - background-color: #F1F4FA; + /* background-color: #F1F4FA; */ margin-bottom: 1.15em; border: 1px #D3DAE6 solid; border-radius: 3px; @@ -44,6 +44,9 @@ transition: .1s ease-in-out; margin-right: 8px; } + &::-webkit-details-marker { + display: none; + } } .content { padding: 5px 20px 0px 36px; From 3ededa59e75c29fe181b20adfdc4ad379bc6c929 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 5 Dec 2024 09:35:56 -0600 Subject: [PATCH 09/10] clean up css --- resources/web/style/base_styles.pcss | 1 - resources/web/style/child_attributes.pcss | 9 --------- resources/web/styles-v1.pcss | 1 - 3 files changed, 11 deletions(-) delete mode 100644 resources/web/style/child_attributes.pcss diff --git a/resources/web/style/base_styles.pcss b/resources/web/style/base_styles.pcss index ccfca53dc8f80..2c08219ea1fcb 100644 --- a/resources/web/style/base_styles.pcss +++ b/resources/web/style/base_styles.pcss @@ -28,7 +28,6 @@ } details { - /* background-color: #F1F4FA; */ margin-bottom: 1.15em; border: 1px #D3DAE6 solid; border-radius: 3px; diff --git a/resources/web/style/child_attributes.pcss b/resources/web/style/child_attributes.pcss deleted file mode 100644 index 1c00830228434..0000000000000 --- a/resources/web/style/child_attributes.pcss +++ /dev/null @@ -1,9 +0,0 @@ -#guide .child_attributes { - - details > div { - border: 1px solid #A9A9A9; - border-radius: 10px; - padding: 15px 10px 0; - margin: 10px 5px 20px; - } -} diff --git a/resources/web/styles-v1.pcss b/resources/web/styles-v1.pcss index 7cfc1c28fad06..7d2f62cba72bd 100644 --- a/resources/web/styles-v1.pcss +++ b/resources/web/styles-v1.pcss @@ -8,7 +8,6 @@ @import './style/alternative_picker.pcss'; @import './style/admonishment.pcss'; @import './style/calloutlist.pcss'; -@import './style/child_attributes.pcss'; @import './style/conum.pcss'; @import './style/code.pcss'; @import './style/console_widget.pcss'; From 434d99047fcb17d4f0d9f52126205a41eb8c0c13 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 5 Dec 2024 10:38:54 -0600 Subject: [PATCH 10/10] prepare to merge! --- conf.yaml | 6 +++--- doc_build_aliases.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.yaml b/conf.yaml index bb97e207628e9..8203396eefec8 100644 --- a/conf.yaml +++ b/conf.yaml @@ -130,9 +130,9 @@ contents: sections: - title: Integrations prefix: en/integrations - current: pre-mdx-to-asciidoc - branches: [ pre-mdx-to-asciidoc ] - live: [ pre-mdx-to-asciidoc ] + current: main + branches: [ main ] + live: [ main ] index: dist/index.asciidoc chunk: 2 private: 1 diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 200c0bf75916d..a274f411b34ca 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -13,7 +13,7 @@ alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/serverless/index.asciidoc --chunk 5 --resource $GIT_HOME/observability-docs/docs/en/serverless --resource $GIT_HOME/security-docs/docs/serverless --resource $GIT_HOME/docs-content/serverless' # Integrations -alias docbldintegration='$GIT_HOME/docs/build_docs --doc $GIT_HOME/integration-docs/dist/index.asciidoc --chunk 2 --open' +alias docbldintegration='$GIT_HOME/docs/build_docs --doc $GIT_HOME/integration-docs/dist/index.asciidoc --chunk 2' # Elasticsearch alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1'