From 03555a4b4a0dee268d6f7cd992740ce129243b69 Mon Sep 17 00:00:00 2001 From: Edward Date: Tue, 22 Feb 2022 08:52:57 +0000 Subject: [PATCH 01/12] Same format of "videoblack" as "imageblock" (#184) --- ui/src/css/doc.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/src/css/doc.css b/ui/src/css/doc.css index 81babc982..f34f561a8 100644 --- a/ui/src/css/doc.css +++ b/ui/src/css/doc.css @@ -261,6 +261,7 @@ .doc .olist, .doc .ulist, .doc .exampleblock, +.doc .videoblock, .doc .imageblock, .doc .listingblock, .doc .literalblock, @@ -691,11 +692,11 @@ .doc .admonitionblock .title, .doc .exampleblock .title, +.doc .videoblock .title, .doc .imageblock .title, .doc .literalblock .title, .doc .listingblock .title, .doc .openblock .title, -.doc .videoblock .title, .doc .tableblock caption { color: var(--caption-font-color); font-size: calc(16 / var(--rem-base) * 1rem); @@ -707,6 +708,7 @@ text-align: left; } +.doc .videoblock .title, .doc .imageblock .title { margin-top: 0.5rem; padding-bottom: 0; From 02b813c99e9f404af7a3a3384b74938d53d61243 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Thu, 28 Apr 2022 05:05:04 -0600 Subject: [PATCH 02/12] fix font color in navbar brand element when logo is used --- ui/src/css/header.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/src/css/header.css b/ui/src/css/header.css index 33ee316e3..473f675fd 100644 --- a/ui/src/css/header.css +++ b/ui/src/css/header.css @@ -36,6 +36,10 @@ body { display: flex; } +.navbar-brand .navbar-item { + color: var(--navbar-font-color); +} + .navbar-brand .navbar-item:first-child { padding: 0; } From ef93c0050493b81a1ce3534f9437fb947d802832 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Wed, 21 Sep 2022 01:36:36 -0600 Subject: [PATCH 03/12] style title on ordered and unordered list --- ui/src/css/doc.css | 12 +++++++++++- ui/src/css/vars.css | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ui/src/css/doc.css b/ui/src/css/doc.css index f34f561a8..45c1262cc 100644 --- a/ui/src/css/doc.css +++ b/ui/src/css/doc.css @@ -700,14 +700,24 @@ .doc .tableblock caption { color: var(--caption-font-color); font-size: calc(16 / var(--rem-base) * 1rem); + font-style: var(--caption-font-style); font-weight: var(--caption-font-weight); - font-style: italic; hyphens: none; letter-spacing: 0.01em; padding-bottom: 0.075rem; +} + +.doc .tableblock caption { text-align: left; } +.doc .ulist .title, +.doc .olist .title { + font-style: var(--caption-font-style); + font-weight: var(--caption-font-weight); + margin-bottom: 0.25rem; +} + .doc .videoblock .title, .doc .imageblock .title { margin-top: 0.5rem; diff --git a/ui/src/css/vars.css b/ui/src/css/vars.css index 31cb53dda..65c88db72 100644 --- a/ui/src/css/vars.css +++ b/ui/src/css/vars.css @@ -96,6 +96,7 @@ --admonition-background: var(--panel-background); --admonition-label-font-weight: var(--body-font-weight-bold); --caption-font-color: var(--color-text); + --caption-font-style: italic; --caption-font-weight: var(--body-font-weight-bold); --code-background: var(--panel-background); --code-font-color: var(--body-font-color); From defc93325c84e185b8f3bf458e67c2277e182cf7 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Wed, 4 Oct 2023 02:51:24 -0600 Subject: [PATCH 04/12] reduce font size of pre inside AsciiDoc table cell --- ui/src/css/doc.css | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/ui/src/css/doc.css b/ui/src/css/doc.css index 45c1262cc..611444ee2 100644 --- a/ui/src/css/doc.css +++ b/ui/src/css/doc.css @@ -275,17 +275,15 @@ margin: 1rem 0 0; } -.doc table.tableblock { - font-size: calc(15 / var(--rem-base) * 1rem); -} - .doc table.tableblock, .doc table.tableblock + * { margin-top: 1.5rem; } -.doc table.tableblock pre { - font-size: inherit; +.doc table.tableblock, +.doc table.tableblock pre, +.doc .admonitionblock pre { + font-size: calc(15 / var(--rem-base) * 1rem); } .doc p.tableblock + p.tableblock { @@ -408,10 +406,6 @@ margin-top: 0; } -.doc .admonitionblock pre { - font-size: calc(15 / var(--rem-base) * 1rem); -} - .doc .admonitionblock > table { table-layout: fixed; position: relative; From bcab45f50c12111f83e05c04577f11f376181d27 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Sat, 25 Nov 2023 02:01:23 -0700 Subject: [PATCH 05/12] sort CSS selectors that match list title --- ui/src/css/doc.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/css/doc.css b/ui/src/css/doc.css index 611444ee2..080f21495 100644 --- a/ui/src/css/doc.css +++ b/ui/src/css/doc.css @@ -705,8 +705,8 @@ text-align: left; } -.doc .ulist .title, -.doc .olist .title { +.doc .olist .title, +.doc .ulist .title { font-style: var(--caption-font-style); font-weight: var(--caption-font-weight); margin-bottom: 0.25rem; From a67b3891318eb0506d3e2753a24d8c84a555c5ff Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Sat, 25 Nov 2023 02:01:52 -0700 Subject: [PATCH 06/12] add support for video tag and video block title --- ui/src/css/doc.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/src/css/doc.css b/ui/src/css/doc.css index 080f21495..e4094819c 100644 --- a/ui/src/css/doc.css +++ b/ui/src/css/doc.css @@ -518,7 +518,8 @@ margin-top: -0.2em; } -.doc .videoblock iframe { +.doc .videoblock iframe, +.doc .videoblock video { max-width: 100%; vertical-align: middle; } @@ -712,8 +713,8 @@ margin-bottom: 0.25rem; } -.doc .videoblock .title, -.doc .imageblock .title { +.doc .imageblock .title, +.doc .videoblock .title { margin-top: 0.5rem; padding-bottom: 0; } From ccd72a251d04453cef5b32c964a9ada50ad0d483 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Sat, 25 Nov 2023 02:33:08 -0700 Subject: [PATCH 07/12] increase precedence of selector that sets font size of pre tag in admonition block --- ui/src/css/doc.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/src/css/doc.css b/ui/src/css/doc.css index e4094819c..8f47c9aaf 100644 --- a/ui/src/css/doc.css +++ b/ui/src/css/doc.css @@ -280,9 +280,7 @@ margin-top: 1.5rem; } -.doc table.tableblock, -.doc table.tableblock pre, -.doc .admonitionblock pre { +.doc table.tableblock { font-size: calc(15 / var(--rem-base) * 1rem); } @@ -290,6 +288,10 @@ margin-top: 0.5rem; } +.doc table.tableblock pre { + font-size: inherit; +} + .doc td.tableblock > .content { word-wrap: anywhere; /* aka overflow-wrap; used when hyphens are disabled or aren't sufficient */ } @@ -406,6 +408,10 @@ margin-top: 0; } +.doc .admonitionblock td.content pre { + font-size: calc(15 / var(--rem-base) * 1rem); +} + .doc .admonitionblock > table { table-layout: fixed; position: relative; From 45927fc5892830e28f628809e85a3b828bc12851 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Sat, 25 Nov 2023 02:35:10 -0700 Subject: [PATCH 08/12] consistently qualify selector for styling table.tableblock --- ui/src/css/doc.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/css/doc.css b/ui/src/css/doc.css index 8f47c9aaf..7a0f3b9a4 100644 --- a/ui/src/css/doc.css +++ b/ui/src/css/doc.css @@ -698,7 +698,7 @@ .doc .literalblock .title, .doc .listingblock .title, .doc .openblock .title, -.doc .tableblock caption { +.doc table.tableblock caption { color: var(--caption-font-color); font-size: calc(16 / var(--rem-base) * 1rem); font-style: var(--caption-font-style); @@ -708,7 +708,7 @@ padding-bottom: 0.075rem; } -.doc .tableblock caption { +.doc table.tableblock caption { text-align: left; } @@ -820,7 +820,7 @@ } /* NEEDS REVIEW prevent pre in table from causing article to exceed bounds */ -.doc .tableblock pre, +.doc table.tableblock pre, .doc .listingblock.wrap pre { white-space: pre-wrap; } From 11518267098d265dce4be07fe48d5533d0ac28c1 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Wed, 14 Feb 2024 02:26:42 -0700 Subject: [PATCH 09/12] use CSS to eagerly hide TOC sidebar before site script gets to it --- ui/src/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/src/css/main.css b/ui/src/css/main.css index 4a4130a0f..b81961b3d 100644 --- a/ui/src/css/main.css +++ b/ui/src/css/main.css @@ -1,3 +1,7 @@ +body.-toc aside.toc.sidebar { + display: none; +} + main { min-width: 0; /* min-width: 0 required for flexbox to constrain overflowing elements */ } From 5f83df70685b432ce6d26ae65e3fdd3c448d360f Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Thu, 18 Jul 2024 12:25:12 -0600 Subject: [PATCH 10/12] set menu panel to full height if explore panel is absent --- ui/src/css/nav.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/src/css/nav.css b/ui/src/css/nav.css index 1c039cb33..d33e939b1 100644 --- a/ui/src/css/nav.css +++ b/ui/src/css/nav.css @@ -83,6 +83,10 @@ height: 100%; } +.nav-panel-menu:only-child { + height: 100%; +} + .nav-panel-menu:not(.is-active) .nav-menu { opacity: 0.75; } From 07ac3a234fa25f6bc8da3506f069f34e681f2ecc Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Mon, 31 Aug 2026 13:46:08 +0200 Subject: [PATCH 11/12] fix: drop a selector that appears twice in one rule Comma-separated selector lists can end up carrying the same selector twice when both the fork and upstream add it at different positions in the list. CSS ignores the repeat, but stylelint's no-duplicate-selectors treats it as an error and the production playbook fails builds on warnings. Keeps upstream's position for the selector so the file converges on upstream and the next re-sync has less to reconcile. Co-Authored-By: Claude --- ui/src/css/doc.css | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/src/css/doc.css b/ui/src/css/doc.css index 7a0f3b9a4..cc6f5cf63 100644 --- a/ui/src/css/doc.css +++ b/ui/src/css/doc.css @@ -267,7 +267,6 @@ .doc .literalblock, .doc .sidebarblock, .doc .verseblock, -.doc .videoblock, .doc .quoteblock, .doc .partintro, .doc details, From fa06b518c74c400785fa95418a413b7b137c6839 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Mon, 31 Aug 2026 13:46:08 +0200 Subject: [PATCH 12/12] chore: record the upstream commit the vendored UI was reviewed against The marker carried no SHA, so there was no way to tell what a re-sync would have to look at. It now names 0e38223a and says plainly that the range is not fully applied: the search UI, typefaces, tabs and the highlight.js language set have diverged far enough that upstream's versions do not apply, and some commits were already present from earlier cherry-picks. Drops a pointer to a plan file outside the repository. It named a path under a home directory, so it resolved for nobody, and the file is not there. Co-Authored-By: Claude --- ui/UPSTREAM | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/UPSTREAM b/ui/UPSTREAM index 926dfd421..83ae2f200 100644 --- a/ui/UPSTREAM +++ b/ui/UPSTREAM @@ -11,6 +11,12 @@ # Update the SHA (and this file) whenever upstream changes have been # reviewed and ported. # -# Last reviewed: NOT YET RECORDED - the fork predates this marker. -# Planned: the phase 3 upstream re-sync establishes the first SHA -# (see ~/dev/stackable/plans/documentation-overhaul.md). +# Reviewed against: 0e38223a (2026-07-16) +# +# Not every upstream commit in that range is present. Some were skipped +# because the subsystem diverged: the search UI is a custom Pagefind +# integration, the typefaces come from fontsource, tabs ship from +# @asciidoctor/tabs, and the highlight.js language set is our own. Others +# were already present from earlier cherry-picks. `git log -- ui/` carries +# the upstream authorship and message of each ported commit, so a future +# re-sync can tell what landed from what did not.