Skip to content

Commit 29b4dbf

Browse files
lfranckeclaudeedward-encoordmojavelinux
authored
chore: Sync the vendored UI with upstream antora-ui-default, part 3: CSS stuff (#926)
Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Edward <edward@encoord.com> Co-authored-by: Dan Allen <dan@opendevise.com>
1 parent 07ff16f commit 29b4dbf

6 files changed

Lines changed: 48 additions & 17 deletions

File tree

ui/UPSTREAM

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
# Update the SHA (and this file) whenever upstream changes have been
1212
# reviewed and ported.
1313
#
14-
# Last reviewed: NOT YET RECORDED - the fork predates this marker.
15-
# Planned: the phase 3 upstream re-sync establishes the first SHA
16-
# (see ~/dev/stackable/plans/documentation-overhaul.md).
14+
# Reviewed against: 0e38223a (2026-07-16)
15+
#
16+
# Not every upstream commit in that range is present. Some were skipped
17+
# because the subsystem diverged: the search UI is a custom Pagefind
18+
# integration, the typefaces come from fontsource, tabs ship from
19+
# @asciidoctor/tabs, and the highlight.js language set is our own. Others
20+
# were already present from earlier cherry-picks. `git log -- ui/` carries
21+
# the upstream authorship and message of each ported commit, so a future
22+
# re-sync can tell what landed from what did not.

ui/src/css/doc.css

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -261,36 +261,36 @@
261261
.doc .olist,
262262
.doc .ulist,
263263
.doc .exampleblock,
264+
.doc .videoblock,
264265
.doc .imageblock,
265266
.doc .listingblock,
266267
.doc .literalblock,
267268
.doc .sidebarblock,
268269
.doc .verseblock,
269-
.doc .videoblock,
270270
.doc .quoteblock,
271271
.doc .partintro,
272272
.doc details,
273273
.doc hr {
274274
margin: 1rem 0 0;
275275
}
276276

277-
.doc table.tableblock {
278-
font-size: calc(15 / var(--rem-base) * 1rem);
279-
}
280-
281277
.doc table.tableblock,
282278
.doc table.tableblock + * {
283279
margin-top: 1.5rem;
284280
}
285281

286-
.doc table.tableblock pre {
287-
font-size: inherit;
282+
.doc table.tableblock {
283+
font-size: calc(15 / var(--rem-base) * 1rem);
288284
}
289285

290286
.doc p.tableblock + p.tableblock {
291287
margin-top: 0.5rem;
292288
}
293289

290+
.doc table.tableblock pre {
291+
font-size: inherit;
292+
}
293+
294294
.doc td.tableblock > .content {
295295
word-wrap: anywhere; /* aka overflow-wrap; used when hyphens are disabled or aren't sufficient */
296296
}
@@ -407,7 +407,7 @@
407407
margin-top: 0;
408408
}
409409

410-
.doc .admonitionblock pre {
410+
.doc .admonitionblock td.content pre {
411411
font-size: calc(15 / var(--rem-base) * 1rem);
412412
}
413413

@@ -523,7 +523,8 @@
523523
margin-top: -0.2em;
524524
}
525525

526-
.doc .videoblock iframe {
526+
.doc .videoblock iframe,
527+
.doc .videoblock video {
527528
max-width: 100%;
528529
vertical-align: middle;
529530
}
@@ -691,23 +692,34 @@
691692

692693
.doc .admonitionblock .title,
693694
.doc .exampleblock .title,
695+
.doc .videoblock .title,
694696
.doc .imageblock .title,
695697
.doc .literalblock .title,
696698
.doc .listingblock .title,
697699
.doc .openblock .title,
698-
.doc .videoblock .title,
699-
.doc .tableblock caption {
700+
.doc table.tableblock caption {
700701
color: var(--caption-font-color);
701702
font-size: calc(16 / var(--rem-base) * 1rem);
703+
font-style: var(--caption-font-style);
702704
font-weight: var(--caption-font-weight);
703-
font-style: italic;
704705
hyphens: none;
705706
letter-spacing: 0.01em;
706707
padding-bottom: 0.075rem;
708+
}
709+
710+
.doc table.tableblock caption {
707711
text-align: left;
708712
}
709713

710-
.doc .imageblock .title {
714+
.doc .olist .title,
715+
.doc .ulist .title {
716+
font-style: var(--caption-font-style);
717+
font-weight: var(--caption-font-weight);
718+
margin-bottom: 0.25rem;
719+
}
720+
721+
.doc .imageblock .title,
722+
.doc .videoblock .title {
711723
margin-top: 0.5rem;
712724
padding-bottom: 0;
713725
}
@@ -807,7 +819,7 @@
807819
}
808820

809821
/* NEEDS REVIEW prevent pre in table from causing article to exceed bounds */
810-
.doc .tableblock pre,
822+
.doc table.tableblock pre,
811823
.doc .listingblock.wrap pre {
812824
white-space: pre-wrap;
813825
}

ui/src/css/header.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ body {
3636
display: flex;
3737
}
3838

39+
.navbar-brand .navbar-item {
40+
color: var(--navbar-font-color);
41+
}
42+
3943
.navbar-brand .navbar-item:first-child {
4044
padding: 0;
4145
}

ui/src/css/main.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
body.-toc aside.toc.sidebar {
2+
display: none;
3+
}
4+
15
main {
26
min-width: 0; /* min-width: 0 required for flexbox to constrain overflowing elements */
37
}

ui/src/css/nav.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@
8383
height: 100%;
8484
}
8585

86+
.nav-panel-menu:only-child {
87+
height: 100%;
88+
}
89+
8690
.nav-panel-menu:not(.is-active) .nav-menu {
8791
opacity: 0.75;
8892
}

ui/src/css/vars.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
--admonition-background: var(--panel-background);
9797
--admonition-label-font-weight: var(--body-font-weight-bold);
9898
--caption-font-color: var(--color-text);
99+
--caption-font-style: italic;
99100
--caption-font-weight: var(--body-font-weight-bold);
100101
--code-background: var(--panel-background);
101102
--code-font-color: var(--body-font-color);

0 commit comments

Comments
 (0)