From b0adba847bfc2ef11ec9c60c26fb607755e6554d Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Thu, 2 Apr 2026 15:57:31 +0200
Subject: [PATCH 1/5] Layout: Adapt to static elastic-nav by making secondary
 nav sticky

The global elastic-nav.js (v2026-03) changed the header from fixed to
static positioning. This makes the secondary docs nav sticky at the top
and simplifies --offset-top to match its height.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../Assets/assembler.css                      | 28 ++-----------------
 .../Layout/_SecondaryNav.cshtml               |  2 +-
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/assembler.css b/src/Elastic.Documentation.Site/Assets/assembler.css
index 39ba8e8ea5..afe96479f0 100644
--- a/src/Elastic.Documentation.Site/Assets/assembler.css
+++ b/src/Elastic.Documentation.Site/Assets/assembler.css
@@ -1,31 +1,9 @@
 /* Assembler build type specific styles */
 
+/* Elastic global nav is position:static (scrolls with page).
+   Only the secondary nav (Docs sub-header) is sticky, so offset-top matches its height. */
 :root {
-	/* Assembler uses Elastic global nav with banner - different heights at different breakpoints */
-	--offset-top: calc(64px + 38px); /* header height + banner height */
-}
-
-@media screen and (min-width: 767px) {
-	:root {
-		--offset-top: calc(72px + 38px); /* header height + banner height */
-	}
-}
-
-@media screen and (min-width: 992px) {
-	:root {
-		--offset-top: 110px;
-	}
-}
-
-@media screen and (min-width: 1180px) {
-	:root {
-		--offset-top: calc(80px + 38px); /* header height + banner height */
-	}
-}
-
-/* Elastic nav wrapper and nav styles - assembler specific */
-#elastic-nav-wrapper {
-	min-height: var(--offset-top);
+	--offset-top: calc(var(--spacing) * 18);
 }
 
 /* Air-gapped: uses elastic-docs-header web component instead of elastic nav */
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 0a4d2ef3ca..c6e5d27ea5 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -1,5 +1,5 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
-<div>
+<div class="sticky top-0 z-30 bg-grey-10">
 	<ask-ai></ask-ai>
 	<nav id="secondary-nav" hx-select-oob="#main-container" hx-swap="none"
 	     class="bg-grey-10 border-grey-20">

From 8256568ba1cbe44e326223c5fe5615dd30e06dd2 Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Thu, 2 Apr 2026 16:02:06 +0200
Subject: [PATCH 2/5] Layout: Only make secondary nav sticky on md+ viewports

On mobile the sticky secondary nav takes too much vertical space.
Keep it static on small screens (--offset-top: 0) and only sticky
on md+ where it provides persistent navigation.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Assets/assembler.css    | 10 ++++++++--
 .../Layout/_SecondaryNav.cshtml                        |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/assembler.css b/src/Elastic.Documentation.Site/Assets/assembler.css
index afe96479f0..b99630104e 100644
--- a/src/Elastic.Documentation.Site/Assets/assembler.css
+++ b/src/Elastic.Documentation.Site/Assets/assembler.css
@@ -1,9 +1,15 @@
 /* Assembler build type specific styles */
 
 /* Elastic global nav is position:static (scrolls with page).
-   Only the secondary nav (Docs sub-header) is sticky, so offset-top matches its height. */
+   The secondary nav (Docs sub-header) is sticky on md+ viewports. */
 :root {
-	--offset-top: calc(var(--spacing) * 18);
+	--offset-top: 0px;
+}
+
+@media screen and (min-width: 768px) {
+	:root {
+		--offset-top: calc(var(--spacing) * 18);
+	}
 }
 
 /* Air-gapped: uses elastic-docs-header web component instead of elastic nav */
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index c6e5d27ea5..73568690f7 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -1,5 +1,5 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
-<div class="sticky top-0 z-30 bg-grey-10">
+<div class="md:sticky md:top-0 md:z-30 bg-grey-10">
 	<ask-ai></ask-ai>
 	<nav id="secondary-nav" hx-select-oob="#main-container" hx-swap="none"
 	     class="bg-grey-10 border-grey-20">

From 54a1745f21eb56ba2b3704e3492d038e64a0b592 Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Thu, 2 Apr 2026 16:55:22 +0200
Subject: [PATCH 3/5] chore: Upgrade lodash to 4.18.x to fix high severity
 vulnerabilities

Fixes code injection via _.template (GHSA-r5fr-rjxr-66jc) and
prototype pollution via _.unset/_.omit (GHSA-f23m-r3pf-42rh).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../package-lock.json                         | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/Elastic.Documentation.Site/package-lock.json b/src/Elastic.Documentation.Site/package-lock.json
index f79b56fbf5..b6d1a50c76 100644
--- a/src/Elastic.Documentation.Site/package-lock.json
+++ b/src/Elastic.Documentation.Site/package-lock.json
@@ -4059,9 +4059,10 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -25373,10 +25374,12 @@
       }
     },
     "node_modules/archiver-utils/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
@@ -28541,9 +28544,10 @@
       }
     },
     "node_modules/jest-config/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -29109,9 +29113,10 @@
       }
     },
     "node_modules/jest-runtime/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -29945,15 +29950,15 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
       "license": "MIT"
     },
     "node_modules/lodash-es": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
-      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
+      "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
       "dev": true,
       "license": "MIT"
     },

From d7406d4821c058e7be08f209770d078e67d3392d Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Thu, 2 Apr 2026 17:08:44 +0200
Subject: [PATCH 4/5] Layout: Add bottom border to secondary nav

The visual separator was coming from #main-container's border-top,
which scrolls away. Adding border-b to the nav itself keeps the
line visible while sticky.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 73568690f7..84f03e90fd 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -2,7 +2,7 @@
 <div class="md:sticky md:top-0 md:z-30 bg-grey-10">
 	<ask-ai></ask-ai>
 	<nav id="secondary-nav" hx-select-oob="#main-container" hx-swap="none"
-	     class="bg-grey-10 border-grey-20">
+	     class="bg-grey-10 border-b border-grey-20">
 		<div class="
 					w-full
 					max-w-(--max-layout-width) flex mx-auto justify-between items-center

From b1dcfea6eb65f83863c2d4bc3a64be9ba35982b9 Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Thu, 2 Apr 2026 17:22:05 +0200
Subject: [PATCH 5/5] Layout: Remove border-top from main-container

The secondary nav now has border-b, so the main-container border-t
was causing a double border.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Elastic.ApiExplorer/_Layout.cshtml | 2 +-
 src/Elastic.Markdown/_Layout.cshtml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Elastic.ApiExplorer/_Layout.cshtml b/src/Elastic.ApiExplorer/_Layout.cshtml
index be5eb9bb01..d8dd9ab92f 100644
--- a/src/Elastic.ApiExplorer/_Layout.cshtml
+++ b/src/Elastic.ApiExplorer/_Layout.cshtml
@@ -11,7 +11,7 @@ else
 {
 	@(await RenderPartialAsync(_IsolatedHeader.Create<GlobalLayoutViewModel>(Model)))
 }
-<div id="main-container" class="flex flex-col items-center border-t-1 border-grey-20">
+<div id="main-container" class="flex flex-col items-center">
 	<div class="max-w-(--max-layout-width) w-full h-full grid
 			grid-cols-1
 			md:grid-cols-[var(--max-sidebar-width)_1fr]
diff --git a/src/Elastic.Markdown/_Layout.cshtml b/src/Elastic.Markdown/_Layout.cshtml
index 8ca87d96df..b88596eddd 100644
--- a/src/Elastic.Markdown/_Layout.cshtml
+++ b/src/Elastic.Markdown/_Layout.cshtml
@@ -60,7 +60,7 @@
 		@(await RenderPartialAsync(_IsolatedHeader.Create<GlobalLayoutViewModel>(Model)))
 	}
 }
-<div id="main-container" class="@(RenderHeaderAndFooter ? "border-t-1 border-grey-20" : "")">
+<div id="main-container">
 @switch (Model.Layout)
 {
 	case MarkdownPageLayout.NotFound: