Skip to content

Commit 801eca4

Browse files
reakaleekreakaleek
committed
Fixes
1 parent f417f9a commit 801eca4

File tree

7 files changed

+49
-43
lines changed

7 files changed

+49
-43
lines changed

‎src/Elastic.Markdown/Assets/markdown/code.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@apply grid;
88
code {
99
@apply text-sm
10-
text-gray-300
10+
text-grey-30
1111
rounded-none
1212
border-0
1313
overflow-x-auto
@@ -23,7 +23,7 @@
2323
@apply rounded-b-sm;
2424
}
2525
code.language-apiheader {
26-
@apply border-b-1 border-b-gray-700;
26+
@apply border-b-1 border-b-grey-80;
2727
}
2828
}
2929

‎src/Elastic.Markdown/Assets/pages-nav.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@ function scrollCurrentNaviItemIntoView(nav: HTMLElement, delay: number) {
1515
const currentNavItem = $('.current', nav);
1616
expandAllParents(currentNavItem);
1717
setTimeout(() => {
18-
if (currentNavItem && !isElementInViewport(currentNavItem)) {
18+
if (currentNavItem && !isElementInViewport(nav, currentNavItem)) {
1919
currentNavItem.scrollIntoView({ behavior: 'smooth', block: 'center' });
2020
window.scrollTo(0, 0);
2121
}
2222
}, delay);
2323
}
24-
function isElementInViewport(el: HTMLElement): boolean {
25-
const rect = el.getBoundingClientRect();
24+
function isElementInViewport(parent: HTMLElement, child: HTMLElement, ): boolean {
25+
const childRect = child.getBoundingClientRect();
26+
const parentRect = parent.getBoundingClientRect();
2627
return (
27-
rect.top >= 0 &&
28-
rect.left >= 0 &&
29-
rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
30-
rect.right <= (window.innerWidth || document.documentElement.clientWidth)
28+
childRect.top >= parentRect.top &&
29+
childRect.left >= parentRect.left &&
30+
childRect.bottom <= parentRect.bottom &&
31+
childRect.right <= parentRect.right
3132
);
3233
}
3334

‎src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
<a
66
itemprop="item"
77
href="@Model.Link("/")"
8-
@Htmx.GetHxAttributes(Model.Features, Model.UrlPathPrefix, Model.Link("/"), Model.CurrentDocument.Url)
8+
@Htmx.GetHxAttributes(Model.Features, Model.UrlPathPrefix, Model.CurrentDocument.Url, Model.Link("/"))
99
>
1010
<span itemprop="name" class="hover:text-black">
1111
Home
1212
</span>
13-
>
14-
<span itemprop="name" class="hover:text-ink">Elastic</span>
1513
</a>
1614
<meta itemprop="position" content="1">
1715
</li>
@@ -25,7 +23,7 @@
2523
<a
2624
itemprop="item"
2725
href="@firstCrumb.Url"
28-
@Htmx.GetHxAttributes(Model.Features, Model.UrlPathPrefix, firstCrumb.Url, Model.CurrentDocument.Url)
26+
@Htmx.GetHxAttributes(Model.Features, Model.UrlPathPrefix, Model.CurrentDocument.Url, firstCrumb.Url)
2927
>
3028
<span itemprop="name" class="hover:text-black">@firstCrumb.NavigationTitle</span>
3129
</a>
@@ -52,7 +50,7 @@
5250
<a
5351
itemprop="item"
5452
href="@item.Url"
55-
@Htmx.GetHxAttributes(Model.Features, Model.UrlPathPrefix, item.Url, Model.CurrentDocument.Url)
53+
@Htmx.GetHxAttributes(Model.Features, Model.UrlPathPrefix, Model.CurrentDocument.Url, item.Url)
5654
>
5755
<span itemprop="name" class="hover:text-black">@item.NavigationTitle</span>
5856
</a>

‎src/Elastic.Markdown/Slices/Layout/_Header.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Model.Features,
4444
Model.CurrentDocument.UrlPathPrefix,
4545
Model.CurrentDocument.Url,
46-
Model.Link("/solutions/security")
46+
Model.Link("/solutions/observability")
4747
)
4848
},
4949
new PrimaryNavDropdownItemViewModel

‎src/Elastic.Markdown/Slices/Layout/_LandingPage.cshtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@
6565
<div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-6 mt-6">
6666
<div class="grow rounded-xl border-1 border-grey-20 p-6">
6767
<div class="flex gap-6 h-full">
68-
<img alt="Observability logo" src="@Model.Static("elasticsearch-logo-color-64px.svg")" class="size-9"/>
68+
<img alt="Search logo" src="@Model.Static("elasticsearch-logo-color-64px.svg")" class="size-9"/>
6969
<div class="flex flex-col h-full">
7070
<p class="font-sans font-bold text-xl">Search</p>
7171
<p class="mt-2 grow">Build powerful search and RAG applications using Elasticsearch's vector database, AI toolkit, and advanced retrieval capabilities.</p>
7272
<div class="grid grid-cols-2 mt-6">
73-
<a href="#" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">Get started</a>
74-
<a href="#" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">View all docs</a>
73+
<a href="/solutions/search/get-started" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">Get started</a>
74+
<a href="/solutions/search" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">View all docs</a>
7575
</div>
7676
</div>
7777
</div>
@@ -83,8 +83,8 @@
8383
<p class="font-sans font-bold text-xl">Observability</p>
8484
<p class="mt-2 grow">Resolve problems with open, flexible, and unified observability powered by advanced machine learning and analytics.</p>
8585
<div class="grid grid-cols-2 mt-6">
86-
<a href="#" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">Get started</a>
87-
<a href="#" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">View all docs</a>
86+
<a href="/solutions/observability/get-started" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">Get started</a>
87+
<a href="/solutions/observability/" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">View all docs</a>
8888
</div>
8989
</div>
9090
</div>
@@ -97,8 +97,8 @@
9797
<p class="font-sans font-bold text-xl">Security</p>
9898
<p class="mt-2 grow">Detect, investigate, and respond to threats with AI-driven security analytics to protect your organization at scale.</p>
9999
<div class="grid grid-cols-2 mt-6">
100-
<a href="#" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">Get started</a>
101-
<a href="#" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">View all docs</a>
100+
<a href="/solutions/security/get-started" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">Get started</a>
101+
<a href="/solutions/security" class="text-blue-elastic hover:text-blue-elastic-100 font-sans font-semibold">View all docs</a>
102102
</div>
103103
</div>
104104
</div>

‎src/Elastic.Markdown/Slices/Layout/_PrimaryNavDropdownItem.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@inherits RazorSlice<PrimaryNavDropdownItemViewModel>
2-
<li class="pb-6 pt-6 xl:first:pt-6 pl-12 pr-6 xl:px-8 flex gap-3 first:border-t-1 not-last:border-b-1 xl:border-none border-grey-20">
2+
<li class="pb-6 pt-6 xl:not-first:pt-0 pl-12 pr-6 xl:px-8 flex gap-3 first:border-t-1 not-last:border-b-1 xl:border-none border-grey-20">
33
@if (Model.IconPath != null)
44
{
55
<div class="size-9 flex items-center justify-center rounded-lg bg-grey-10 shrink-0">

‎src/Elastic.Markdown/Slices/_Layout.cshtml

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,34 @@
44
@await RenderPartialAsync(_Head.Create(Model))
55
<body class="group/body text-ink has-[#primary-nav-hamburger:checked]:overflow-hidden" hx-ext="preload, head-support">
66
@(await RenderPartialAsync(_Header.Create(Model)))
7-
<div class="flex flex-col items-center px-6">
8-
<div class="flex container">
9-
@await RenderPartialAsync(_PagesNav.Create(Model))
10-
@await RenderPartialAsync(_TableOfContents.Create(Model))
11-
<main class="w-full order-2 relative pb-30">
12-
<div class="w-full absolute top-0 left-0 right-0 htmx-indicator" id="htmx-indicator" role="status">
13-
<div class="h-[2px] w-full overflow-hidden">
14-
<div class="progress w-full h-full bg-pink-70 left-right"></div>
7+
<div id="main-container" class="flex flex-col items-center px-6">
8+
@if (Model.Features.IsLandingPageEnabled && Model.CurrentDocument.Url == Model.Link("/"))
9+
{
10+
@await RenderPartialAsync(_LandingPage.Create(Model))
11+
}
12+
else
13+
{
14+
<div class="flex container">
15+
@await RenderPartialAsync(_PagesNav.Create(Model))
16+
@await RenderPartialAsync(_TableOfContents.Create(Model))
17+
<main class="w-full order-2 relative pb-30">
18+
<div class="w-full absolute top-0 left-0 right-0 htmx-indicator" id="htmx-indicator" role="status">
19+
<div class="h-[2px] w-full overflow-hidden">
20+
<div class="progress w-full h-full bg-pink-70 left-right"></div>
21+
</div>
22+
<div class="sr-only">Loading</div>
1523
</div>
16-
<div class="sr-only">Loading</div>
17-
</div>
18-
<div class="content-container lg:px-6">
19-
@await RenderPartialAsync(_Breadcrumbs.Create(Model))
20-
</div>
21-
<article id="markdown-content" class="content-container markdown-content lg:px-6">
22-
<input type="checkbox" class="hidden" id="pages-nav-hamburger">
23-
@await RenderBodyAsync()
24-
</article>
25-
@await RenderPartialAsync(_PrevNextNav.Create(Model))
26-
</main>
27-
</div>
24+
<div class="content-container lg:px-6">
25+
@await RenderPartialAsync(_Breadcrumbs.Create(Model))
26+
</div>
27+
<article id="markdown-content" class="content-container markdown-content lg:px-6">
28+
<input type="checkbox" class="hidden" id="pages-nav-hamburger">
29+
@await RenderBodyAsync()
30+
</article>
31+
@await RenderPartialAsync(_PrevNextNav.Create(Model))
32+
</main>
33+
</div>
34+
}
2835
</div>
2936
@await RenderPartialAsync(_Footer.Create(Model))
3037
</body>

0 commit comments

Comments
 (0)