Skip to content

Commit 7fd157b

Browse files
Layout: Merge branch 'main' into maximus-sidebar-scroll-anchor-578
2 parents a2a0009 + fe821ae commit 7fd157b

File tree

14 files changed

+77
-330
lines changed

14 files changed

+77
-330
lines changed

.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
insert_final_newline = true
7+
end_of_line = lf

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
BIOME_BASE_CMD := $(if $(shell which biome),biome,npx @biomejs/[email protected])
2-
BIOME_CONFIG_PATH := --config-path="biome.json"
32
WRITE_FLAG := --write
43

54
.PHONY: list help
@@ -26,11 +25,11 @@ ifeq ($(BIOME_ARGS), write)
2625
endif
2726

2827
biome-format:
29-
$(BIOME_BASE_CMD) format $(BIOME_CONFIG_PATH) $(FLAG)
28+
$(BIOME_BASE_CMD) format $(FLAG)
3029
biome-lint:
31-
$(BIOME_BASE_CMD) lint $(BIOME_CONFIG_PATH) $(FLAG)
30+
$(BIOME_BASE_CMD) lint $(FLAG)
3231
biome-all:
33-
$(BIOME_BASE_CMD) check $(BIOME_CONFIG_PATH) $(FLAG)
32+
$(BIOME_BASE_CMD) check $(FLAG)
3433

3534
setup-pre-commit:
3635
@if ! command -v pre-commit &> /dev/null; then \

assets/css/v2/style.css

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,9 @@ textarea:not([rows]) {
246246
--product-selector-background: 0.98 0 0;
247247

248248
/* vars for the primary grid setup */
249-
--grid-content: minmax(34rem, 50rem);
250-
--grid-content-mobile: minmax(20rem, 50rem);
249+
--grid-max: 50rem;
250+
--grid-content: minmax(34rem, var(--grid-max));
251+
--grid-content-mobile: minmax(20rem, var(--grid-max));
251252
--grid-side-callout: minmax(18rem, 26rem);
252253
--grid-column-gutter: 3.5rem;
253254

@@ -313,7 +314,7 @@ textarea:not([rows]) {
313314
--sidebar-item-padding-tb: 0.25rem;
314315
--content-max-width: 88rem;
315316

316-
--main-col: minmax(34rem, 50rem);
317+
--main-col: minmax(34rem, var(--grid-max));
317318
--side-col: minmax(18rem, 26rem);
318319
}
319320

@@ -1293,7 +1294,6 @@ main {
12931294
/* Search results on content */
12941295
atomic-search-interface#search-v2 {
12951296
position: relative;
1296-
z-index: 1;
12971297
/* biome-ignore lint: Coveo override */
12981298
display: inline-block !important;
12991299
width: 95vw;
@@ -1930,6 +1930,7 @@ table {
19301930
font-size: var(--font-step-0);
19311931

19321932
td {
1933+
max-width: var(--grid-max);
19331934
vertical-align: middle;
19341935
padding: var(--table-inner-padding);
19351936
background: transparent;
@@ -2012,9 +2013,22 @@ blockquote {
20122013
margin: 0;
20132014
}
20142015

2016+
/* Prevent codeblock x-axis overflow within callouts, retaining flow-gap for y */
2017+
.callout-content:has(.code-block) {
2018+
.code-block {
2019+
margin-right: 0;
2020+
margin-left: 0;
2021+
}
2022+
}
2023+
20152024
.callout-content {
20162025
margin: 0;
20172026
}
2027+
2028+
/* To help them align with text, side callouts should not have top margin*/
2029+
&[data-grid="last-third"] {
2030+
--margin-callout: 0 0 0 1rem;
2031+
}
20182032
}
20192033

20202034
blockquote.note {
@@ -2388,6 +2402,10 @@ ul .code-block {
23882402

23892403
.banner {
23902404
margin-block-start: 1rem;
2405+
2406+
blockquote {
2407+
margin-left: 0rem;
2408+
}
23912409
}
23922410

23932411
/* MARK: Images

biome.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://biomejs.dev/schemas/2.2.2/schema.json",
3-
"root": false,
3+
"root": true,
44
"vcs": {
55
"enabled": true,
66
"clientKind": "git",

exampleSite/data/f5-sites.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- title: NGINX Documentation
2+
url: https://docs.nginx.com/
3+
description: Learn how to deliver, manage, and protect your applications using F5 NGINX products.
4+
5+
- title: NGINX
6+
url: https://nginx.org/
7+
description: Learn more about NGINX Open Source and read the community blog

layouts/partials/callout.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
<blockquote class="{{ $class }}" data-grid="{{ $dataGrid }}">
3636
<div>
3737
<div class="call-out-type">
38-
{{ partial "lucide" (dict "context" . "icon" $icon) .}}
38+
{{ partial "lucide" (dict "context" . "icon" $icon) . }}
3939
{{ $title }}
4040
</div>
4141
<div class="callout-content">
42-
{{ .content | markdownify }}
42+
{{- .content | markdownify -}}
4343
</div>
4444
</div>
4545
</blockquote>

layouts/partials/f5-sites.html

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<div class="header__f5sites">
2+
{{ with index .Site.Data "f5-sites" }}
3+
{{ $f5Sites := . }}
4+
<div class="navbar navbar-nav">
5+
<div class="nav-item-explore active">
6+
<button id="navbar-sites-button" class="button navbar-button dropdown-button" data-testid="header__f5sites_button">
7+
F5 Sites
8+
<span class="header__f5sites--icon">
9+
{{ partial "lucide" (dict "context" . "icon" "chevron-down") }}
10+
</span>
11+
</button>
12+
<div class="dropdown-content" id="dropdown-content" data-testid="header__f5sites_content">
13+
<ul>
14+
{{ range $f5Sites }}
15+
<li>
16+
<a href="{{ .url }}" target="_blank" >{{ .title }}</a>
17+
<p>{{ .description }}</p>
18+
</li>
19+
{{ end }}
20+
</ul>
21+
</div>
22+
</div>
23+
</div>
24+
{{ end }}
25+
</div>

layouts/partials/footer-v2.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
target="_blank"
3535
>Do Not Sell My Personal Information
3636
</a>
37-
<span id="teconsent-v2"></span>
37+
<span id="teconsent"></span>
3838
</div>
3939
</div>

0 commit comments

Comments
 (0)