From 75cfd58059136a8e13e02bafcba8715abff9fac6 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Wed, 1 Oct 2025 12:56:24 +0200 Subject: [PATCH 1/3] Revert applies_to in directives design for recognition value --- .../Assets/markdown/applies-switch.css | 10 +++------- .../Assets/markdown/applies-to.css | 8 +++----- .../Assets/markdown/dropdown.css | 10 +++------- .../Myst/Components/ApplicableToViewModel.cs | 6 +++--- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/Elastic.Documentation.Site/Assets/markdown/applies-switch.css b/src/Elastic.Documentation.Site/Assets/markdown/applies-switch.css index aaa4ae90d..f52680870 100644 --- a/src/Elastic.Documentation.Site/Assets/markdown/applies-switch.css +++ b/src/Elastic.Documentation.Site/Assets/markdown/applies-switch.css @@ -13,22 +13,18 @@ } } - .applies-item { + &>.applies-switch-label>.applies-item { @apply cursor-pointer text-inherit; &:hover { @apply text-inherit; } .applicable-info { - @apply cursor-pointer border-none bg-transparent p-0; - - &:not(:last-child):after { - content: ','; - } + @apply cursor-pointer; } .applicable-name, .applicable-meta { - @apply text-base; + @apply text-xs; } } diff --git a/src/Elastic.Documentation.Site/Assets/markdown/applies-to.css b/src/Elastic.Documentation.Site/Assets/markdown/applies-to.css index 312e4da4d..9ee227e18 100644 --- a/src/Elastic.Documentation.Site/Assets/markdown/applies-to.css +++ b/src/Elastic.Documentation.Site/Assets/markdown/applies-to.css @@ -9,7 +9,7 @@ } .applicable-info { - @apply border-grey-20 inline-grid cursor-default grid-cols-[auto_1fr_auto] rounded-full border-[1px] bg-white pt-1.5 pr-3 pb-1.5 pl-3; + @apply border-grey-20 inline-flex cursor-default rounded-full border-[1px] bg-white pt-1.5 pr-3 pb-1.5 pl-3; } .applicable-meta { @@ -22,11 +22,9 @@ } .applicable-separator { + @apply self-stretch bg-grey-20 mx-2; + mix-blend-mode: multiply; width: 1px; - height: 100%; - background-color: var(--color-grey-20); - margin-left: calc(var(--spacing) * 2); - margin-right: calc(var(--spacing) * 2); } } diff --git a/src/Elastic.Documentation.Site/Assets/markdown/dropdown.css b/src/Elastic.Documentation.Site/Assets/markdown/dropdown.css index 7d93588f9..d57b362ab 100644 --- a/src/Elastic.Documentation.Site/Assets/markdown/dropdown.css +++ b/src/Elastic.Documentation.Site/Assets/markdown/dropdown.css @@ -38,17 +38,13 @@ } .applies-dropdown { - @apply flex cursor-pointer items-center gap-1 p-2 px-4 font-normal; + @apply flex cursor-pointer items-center gap-1 p-2 px-2 font-normal; .applicable-info { - @apply cursor-pointer border-none bg-transparent p-0; - &:not(:last-child):after { - @apply text-sm; - content: ','; - } + @apply cursor-pointer; } .applicable-name, .applicable-meta { - @apply text-sm; + @apply text-xs; } } } diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs index 483d6eee1..27213d5e5 100644 --- a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs +++ b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs @@ -64,9 +64,6 @@ public IEnumerable GetApplicabilityItems() { var items = new List(); - if (AppliesTo.Stack is not null) - items.AddRange(ProcessSingleCollection(AppliesTo.Stack, ApplicabilityMappings.Stack)); - if (AppliesTo.Serverless is not null) { items.AddRange(AppliesTo.Serverless.AllProjects is not null @@ -74,6 +71,9 @@ public IEnumerable GetApplicabilityItems() : ProcessMappedCollections(AppliesTo.Serverless, ServerlessMappings)); } + if (AppliesTo.Stack is not null) + items.AddRange(ProcessSingleCollection(AppliesTo.Stack, ApplicabilityMappings.Stack)); + if (AppliesTo.Deployment is not null) items.AddRange(ProcessMappedCollections(AppliesTo.Deployment, DeploymentMappings)); From 597081c375bfbb0d69422329d560dd8122ba159f Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Wed, 1 Oct 2025 13:11:23 +0200 Subject: [PATCH 2/3] Run prettier --- .../Assets/markdown/applies-switch.css | 2 +- src/Elastic.Documentation.Site/Assets/markdown/applies-to.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Elastic.Documentation.Site/Assets/markdown/applies-switch.css b/src/Elastic.Documentation.Site/Assets/markdown/applies-switch.css index f52680870..4d183e939 100644 --- a/src/Elastic.Documentation.Site/Assets/markdown/applies-switch.css +++ b/src/Elastic.Documentation.Site/Assets/markdown/applies-switch.css @@ -13,7 +13,7 @@ } } - &>.applies-switch-label>.applies-item { + & > .applies-switch-label > .applies-item { @apply cursor-pointer text-inherit; &:hover { diff --git a/src/Elastic.Documentation.Site/Assets/markdown/applies-to.css b/src/Elastic.Documentation.Site/Assets/markdown/applies-to.css index 9ee227e18..d371819df 100644 --- a/src/Elastic.Documentation.Site/Assets/markdown/applies-to.css +++ b/src/Elastic.Documentation.Site/Assets/markdown/applies-to.css @@ -22,7 +22,7 @@ } .applicable-separator { - @apply self-stretch bg-grey-20 mx-2; + @apply bg-grey-20 mx-2 self-stretch; mix-blend-mode: multiply; width: 1px; } From 133eff54595e1f5918afcb4bb515a5ec15b8b9ce Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Wed, 1 Oct 2025 13:14:21 +0200 Subject: [PATCH 3/3] Fix tests --- .../Applicability/ApplicableToComponent.fs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/authoring/Applicability/ApplicableToComponent.fs b/tests/authoring/Applicability/ApplicableToComponent.fs index c2487cbf3..2878c4a95 100644 --- a/tests/authoring/Applicability/ApplicableToComponent.fs +++ b/tests/authoring/Applicability/ApplicableToComponent.fs @@ -554,15 +554,6 @@ apm_agent_java: beta 9.1.0 let ``renders complex mixed scenario`` () = markdown |> convertsToHtml """

- - Stack - - - Planned - - @@ -581,6 +572,15 @@ This functionality may be changed or removed in a future release. Elastic will w Planned + + Stack + + + Planned + + @@ -723,17 +723,17 @@ product: ga 9.0.0 let ``renders missing VersioningSystemId coverage`` () = markdown |> convertsToHtml """

- - Stack + + Serverless Planned - - Serverless + + Stack Planned