From 4452c7acbd387f46c94d88cf0f9df843bf7d8a60 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 11 Oct 2023 09:45:37 +0200 Subject: [PATCH 1/5] Whitespace --- site/content/3.10/_index.md | 1 - site/content/3.11/_index.md | 2 +- site/content/3.12/_index.md | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/site/content/3.10/_index.md b/site/content/3.10/_index.md index 647de4c88c..b1232f05d6 100644 --- a/site/content/3.10/_index.md +++ b/site/content/3.10/_index.md @@ -4,7 +4,6 @@ menuTitle: '3.10' weight: 0 layout: default --- - {{< cloudbanner >}} {{< cards >}} diff --git a/site/content/3.11/_index.md b/site/content/3.11/_index.md index 1670162522..9b10d58b29 100644 --- a/site/content/3.11/_index.md +++ b/site/content/3.11/_index.md @@ -4,8 +4,8 @@ menuTitle: '3.11' weight: 0 layout: default --- - {{< cloudbanner >}} + {{< cards >}} {{% card title="What is ArangoDB?" link="introduction/about-arangodb/" %}} diff --git a/site/content/3.12/_index.md b/site/content/3.12/_index.md index 565cd4db09..557433a46f 100644 --- a/site/content/3.12/_index.md +++ b/site/content/3.12/_index.md @@ -4,7 +4,6 @@ menuTitle: '3.12' weight: 0 layout: default --- - {{< cloudbanner >}} {{< cards >}} From 3742d9bc451822bae2a3876e46e17914e9479627 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 11 Oct 2023 09:46:09 +0200 Subject: [PATCH 2/5] Remove non-existing / unused success admonition --- migration-tools/scripts/automata.py | 4 ++-- toolchain/arangoproxy/internal/format/format.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/migration-tools/scripts/automata.py b/migration-tools/scripts/automata.py index 3ebe04374c..bb8c7cbde1 100644 --- a/migration-tools/scripts/automata.py +++ b/migration-tools/scripts/automata.py @@ -172,14 +172,14 @@ def getHugoMetrics(content): continue ##Hints - if re.search(r"{{< warning|{{< info|{{< danger|{{< success|{{< tip|{{< security", line, re.MULTILINE): + if re.search(r"{{< warning|{{< info|{{< danger|{{< tip|{{< security", line, re.MULTILINE): if flags["inDocublock"]: continue metrics["hints"] += 1 continue - if re.search(r"{{< /warning|{{< /info|{{< /danger|{{< /success|{{< /tip|{{< /security", line, re.MULTILINE): + if re.search(r"{{< /warning|{{< /info|{{< /danger|{{< /tip|{{< /security", line, re.MULTILINE): continue ## Details diff --git a/toolchain/arangoproxy/internal/format/format.go b/toolchain/arangoproxy/internal/format/format.go index c1fc91b132..f507a9e734 100644 --- a/toolchain/arangoproxy/internal/format/format.go +++ b/toolchain/arangoproxy/internal/format/format.go @@ -142,13 +142,11 @@ func (formatter OpenapiFormatter) EditDescriptions(req []byte) []byte { payloadString = strings.Replace(payloadString, "{{< warning >}}", "> **WARNING:**", -1) payloadString = strings.Replace(payloadString, "{{< info >}}", "> **INFO:**", -1) payloadString = strings.Replace(payloadString, "{{< danger >}}", "> **DANGER:**", -1) - payloadString = strings.Replace(payloadString, "{{< success >}}", "> **SUCCESS:**", -1) payloadString = strings.Replace(payloadString, "{{< tip >}}", "> **TIP:**", -1) payloadString = strings.Replace(payloadString, "{{< /tip >}}", "", -1) payloadString = strings.Replace(payloadString, "{{< /warning >}}", "", -1) payloadString = strings.Replace(payloadString, "{{< /info >}}", "", -1) - payloadString = strings.Replace(payloadString, "{{< /success >}}", "", -1) payloadString = strings.Replace(payloadString, "{{< /danger >}}", "", -1) return []byte(payloadString) From b9b3958785ca65d00558f92af83e47b2cbfccfb3 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 11 Oct 2023 09:59:58 +0200 Subject: [PATCH 3/5] Make left border of security admonition consistent --- site/themes/arangodb-docs-theme/static/css/theme.css | 1 - 1 file changed, 1 deletion(-) diff --git a/site/themes/arangodb-docs-theme/static/css/theme.css b/site/themes/arangodb-docs-theme/static/css/theme.css index a42a1ed1ed..da205e9296 100644 --- a/site/themes/arangodb-docs-theme/static/css/theme.css +++ b/site/themes/arangodb-docs-theme/static/css/theme.css @@ -1607,7 +1607,6 @@ div.box.tip { div.box.security { border: 1px solid var(--SECURITY-BORDER-COLOR); - border-left: 0px; background: var(--SECURITY-BG-COLOR); box-shadow: 0 0 0 2px var(--SECURITY-BORDER-COLOR) inset,0 0 0 0 transparent } From e0bcc5286d0694980d25da1de8e41191c662c24f Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Wed, 11 Oct 2023 10:09:45 +0200 Subject: [PATCH 4/5] A light background to admonitions --- .../static/css/theme-relearn-light.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site/themes/arangodb-docs-theme/static/css/theme-relearn-light.css b/site/themes/arangodb-docs-theme/static/css/theme-relearn-light.css index 44ee94f3a3..a934e45140 100644 --- a/site/themes/arangodb-docs-theme/static/css/theme-relearn-light.css +++ b/site/themes/arangodb-docs-theme/static/css/theme-relearn-light.css @@ -109,22 +109,22 @@ /* ADMONITIONS */ --INFO-ICON-COLOR: var(--blue-500); - --INFO-BG-COLOR: transparent; + --INFO-BG-COLOR: var(--blue-50); --INFO-BORDER-COLOR: var(--blue-500); --WARNING-ICON-COLOR: var(--orange-400); + --WARNING-BG-COLOR: var(--orange-50); --WARNING-BORDER-COLOR: var(--orange-400); - --WARNING-BG-COLOR: transparent; --DANGER-ICON-COLOR: var(--red-500); + --DANGER-BG-COLOR: var(--red-50); --DANGER-BORDER-COLOR: var(--red-500); - --DANGER-BG-COLOR: transparent; --TIP-ICON-COLOR: var(--green-600); - --TIP-BG-COLOR: transparent; + --TIP-BG-COLOR: var(--green-50); --TIP-BORDER-COLOR: var(--green-600); --SECURITY-ICON-COLOR: var(--orange-400); - --SECURITY-BG-COLOR: transparent; + --SECURITY-BG-COLOR: var(--orange-50); --SECURITY-BORDER-COLOR: var(--orange-400); } From 3b0cd9316cc6107e0dc11692f6fc6e29684625fa Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Mon, 16 Oct 2023 13:01:53 +0200 Subject: [PATCH 5/5] Don't use background colors after all --- .../static/css/theme-relearn-light.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site/themes/arangodb-docs-theme/static/css/theme-relearn-light.css b/site/themes/arangodb-docs-theme/static/css/theme-relearn-light.css index a934e45140..c52ee59c17 100644 --- a/site/themes/arangodb-docs-theme/static/css/theme-relearn-light.css +++ b/site/themes/arangodb-docs-theme/static/css/theme-relearn-light.css @@ -109,22 +109,22 @@ /* ADMONITIONS */ --INFO-ICON-COLOR: var(--blue-500); - --INFO-BG-COLOR: var(--blue-50); + --INFO-BG-COLOR: transparent; --INFO-BORDER-COLOR: var(--blue-500); --WARNING-ICON-COLOR: var(--orange-400); - --WARNING-BG-COLOR: var(--orange-50); + --WARNING-BG-COLOR: transparent; --WARNING-BORDER-COLOR: var(--orange-400); --DANGER-ICON-COLOR: var(--red-500); - --DANGER-BG-COLOR: var(--red-50); + --DANGER-BG-COLOR: transparent; --DANGER-BORDER-COLOR: var(--red-500); --TIP-ICON-COLOR: var(--green-600); - --TIP-BG-COLOR: var(--green-50); + --TIP-BG-COLOR: transparent; --TIP-BORDER-COLOR: var(--green-600); --SECURITY-ICON-COLOR: var(--orange-400); - --SECURITY-BG-COLOR: var(--orange-50); + --SECURITY-BG-COLOR: transparent; --SECURITY-BORDER-COLOR: var(--orange-400); }