Skip to content

Commit a06d5e0

Browse files
authored
Merge branch 'main' into fix/kvs_update_resiliency
2 parents a428236 + edf52c6 commit a06d5e0

File tree

13 files changed

+345
-292
lines changed

13 files changed

+345
-292
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ jobs:
8787
- windows-latest
8888
steps:
8989
- uses: actions/checkout@v5
90+
- name: 'Windows only, set TEMP to the same drive'
91+
if: ${{ matrix.os == 'windows-latest' }}
92+
# temporary waiting for https://github.com/parcel-bundler/parcel/pull/10095 to fix
93+
run: |
94+
mkdir "D:\\Temp"
95+
echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
9096
9197
- name: Bootstrap Action Workspace
9298
id: bootstrap

.github/workflows/release.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ jobs:
147147
- uses: actions/checkout@v5
148148
with:
149149
ref: ${{ needs.release-drafter.outputs.tag_name }}
150+
- name: 'Windows only, set TEMP to the same drive'
151+
if: ${{ matrix.os == 'windows-latest' }}
152+
# temporary waiting for https://github.com/parcel-bundler/parcel/pull/10095 to fix
153+
run: |
154+
mkdir "D:\\Temp"
155+
echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
150156
151157
- name: Bootstrap Action Workspace
152158
id: bootstrap

config/versions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ versioning_systems:
5050
current: 1.55.1
5151
apm-agent-node:
5252
base: 4.0
53-
current: 4.13.0
53+
current: 4.14.0
5454
apm-agent-php:
5555
base: 1.0
5656
current: 1.15.1
@@ -101,7 +101,7 @@ versioning_systems:
101101
edot-cf-azure:
102102
base: 0.1
103103
current: 0.6.0
104-
104+
105105
# Logging
106106
ecs-logging-dotnet:
107107
base: 8.0
@@ -136,8 +136,8 @@ versioning_systems:
136136
search-ui:
137137
base: 1.0
138138
current: 1.24.2
139-
140-
# Other
139+
140+
# Other
141141
cloud-terraform:
142142
base: 0.11
143143
current: 0.11.17

docs/syntax/dropdowns.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,55 @@ Dropdown content
5050
::::
5151

5252
:::::
53+
54+
## With applies_to badge
55+
56+
You can add an applies_to badge to the dropdown title by specifying the `:applies_to:` option. This displays a badge indicating which deployment types, versions, or other applicability criteria the dropdown content applies to.
57+
58+
:::::{tab-set}
59+
60+
::::{tab-item} Output
61+
62+
:::{dropdown} Dropdown Title
63+
:applies_to: stack: ga 9.0
64+
Dropdown content for Stack GA 9.0
65+
:::
66+
67+
::::
68+
69+
::::{tab-item} Markdown
70+
```markdown
71+
:::{dropdown} Dropdown Title
72+
:applies_to: stack: ga 9.0
73+
Dropdown content for Stack GA 9.0
74+
:::
75+
```
76+
::::
77+
78+
:::::
79+
80+
## Multiple applies_to definitions
81+
82+
You can specify multiple `applies_to` definitions using YAML object notation with curly braces `{}`. This is useful when content applies to multiple deployment types or versions simultaneously.
83+
84+
:::::{tab-set}
85+
86+
::::{tab-item} Output
87+
88+
:::{dropdown} Dropdown Title
89+
:applies_to: { ece:, ess: }
90+
Dropdown content for ECE and ECH
91+
:::
92+
93+
::::
94+
95+
::::{tab-item} Markdown
96+
```markdown
97+
:::{dropdown} Dropdown Title
98+
:applies_to: { ece:, ess: }
99+
Dropdown content for ECE and ECH
100+
:::
101+
```
102+
::::
103+
104+
:::::

src/Elastic.Documentation.Site/Assets/markdown/dropdown.css

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
details.dropdown {
88
@apply border-grey-20 mt-4 block rounded-sm border-1 shadow-xs;
99
summary.dropdown-title {
10-
@apply text-ink-dark flex cursor-pointer items-center justify-between px-4 py-2 font-sans font-bold;
10+
@apply text-ink-dark flex cursor-pointer items-stretch justify-between font-sans font-bold;
1111
}
1212

1313
&[open] .dropdown-title {
@@ -20,6 +20,37 @@
2020
.dropdown-content {
2121
@apply px-4 pb-4;
2222
}
23+
24+
.dropdown-title__container {
25+
@apply flex items-stretch;
26+
}
27+
28+
.dropdown-title__separator {
29+
@apply bg-grey-20 block w-[1px];
30+
}
31+
32+
.dropdown-title__icon {
33+
@apply flex items-center justify-center px-4 py-2;
34+
}
35+
36+
.dropdown-title__summary-text {
37+
@apply flex items-center px-4 py-2;
38+
}
39+
40+
.applies-dropdown {
41+
@apply flex cursor-pointer items-center gap-1 p-2 px-4 font-normal;
42+
.applicable-info {
43+
@apply cursor-pointer border-none bg-transparent p-0;
44+
&:not(:last-child):after {
45+
@apply text-sm;
46+
content: ',';
47+
}
48+
}
49+
.applicable-name,
50+
.applicable-meta {
51+
@apply text-sm;
52+
}
53+
}
2354
}
2455
}
2556
}

0 commit comments

Comments
 (0)