From 8449d53c387e2e34bf30fc2350771164b8dbe1fe Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Tue, 28 Jul 2026 09:37:32 +0200
Subject: [PATCH 01/38] Fix alert
---
Customization/xsl/topic.xsl | 4 +-
css/common-bootstrap.css | 6 +-
includes/bootstrap.hdf.xml | 29 ++++++---
includes/ftr.sidebar.example.xml | 4 +-
sample/alerts.dita | 104 +++++++++++++++----------------
sample/document.ditamap | 12 ++--
xsl/utility-classes.xsl | 45 ++++++-------
7 files changed, 105 insertions(+), 99 deletions(-)
diff --git a/Customization/xsl/topic.xsl b/Customization/xsl/topic.xsl
index 4a7a2c57..961add5b 100644
--- a/Customization/xsl/topic.xsl
+++ b/Customization/xsl/topic.xsl
@@ -296,9 +296,7 @@
-
-
-
+
diff --git a/css/common-bootstrap.css b/css/common-bootstrap.css
index 6e29dafd..a8e95852 100644
--- a/css/common-bootstrap.css
+++ b/css/common-bootstrap.css
@@ -44,7 +44,7 @@
}
[data-bs-theme='light'] {
- --dita-violet: var(--bs-purple);
+ --dita-violet: var(--bs-purple-400);
}
}
@@ -127,11 +127,11 @@
.note {
border-left: 6px solid;
- border-left-color: var(--bs-alert-color, transparent);
+ border-left-color: var(--bs-alert-border-color, transparent);
}
[dir='rtl'] .note {
border-right: 6px solid;
- border-right-color: var(--bs-alert-color, transparent);
+ border-right-color: var(--bs-alert-border-color, transparent);
border-left: 0;
}
diff --git a/includes/bootstrap.hdf.xml b/includes/bootstrap.hdf.xml
index f8fa94d6..e19a37d4 100644
--- a/includes/bootstrap.hdf.xml
+++ b/includes/bootstrap.hdf.xml
@@ -1,13 +1,26 @@
-
-
+
diff --git a/includes/ftr.sidebar.example.xml b/includes/ftr.sidebar.example.xml
index 95268b4d..90828772 100644
--- a/includes/ftr.sidebar.example.xml
+++ b/includes/ftr.sidebar.example.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/sample/alerts.dita b/sample/alerts.dita
index 9ffc442a..e08181d5 100644
--- a/sample/alerts.dita
+++ b/sample/alerts.dita
@@ -30,71 +30,71 @@
Example
Alerts are available for any length of text, as well as an optional close button. For proper styling, use one
of the eight required contextual classes (e.g., set outputclass to
- alert-success ).
+
alert theme-success ).
- A simple primary alertβcheck it out!
- A simple secondary alertβcheck it out!
- A simple success alertβcheck it out!
- A simple danger alertβcheck it out!
- A simple warning alertβcheck it out!
- A simple info alertβcheck it out!
- A simple light alertβcheck it out!
- A simple dark alertβcheck it out!
+ A simple primary alert β check it out!
+ A simple secondary alert β check it out!
+ A simple success alert β check it out!
+ A simple danger alert β check it out!
+ A simple warning alert β check it out!
+ A simple info alert β check it out!
+ A simple accent alert β check it out!
+ A simple inverse alert β check it out!
outputclass
- <section outputclass="alert-primary">
- A simple primary alertβcheck it out!
+ <section outputclass="alert theme-primary">
+ A simple primary alert β check it out!
</section>
-<section outputclass="alert-secondary">
- A simple secondary alertβcheck it out!
+<section outputclass="alert theme-secondary">
+ A simple secondary alert β check it out!
</section>
-<section outputclass="alert-success">
- A simple success alertβcheck it out!
+<section outputclass="alert theme-success">
+ A simple success alert β check it out!
</section>
-<section outputclass="alert-danger">
- A simple danger alertβcheck it out!
+<section outputclass="alert theme-danger">
+ A simple danger alert β check it out!
</section>
-<section outputclass="alert-warning">
- A simple warning alertβcheck it out!
+<section outputclass="alert theme-warning">
+ A simple warning alert β check it out!
</section>
-<section outputclass="alert-info">
- A simple info alertβcheck it out!
+<section outputclass="alert theme-info">
+ A simple info alert β check it out!
</section>
-<section outputclass="alert-light">
- A simple light alertβcheck it out!
+<section outputclass="alert theme-accent">
+ A simple accent alert β check it out!
</section>
-<section outputclass="alert-dark">
- A simple dark alertβcheck it out!
+<section outputclass="alert theme-inverse">
+ A simple inverse alert β check it out!
</section>
Specialization
<alert color="primary">
- A simple primary alertβcheck it out!
+ A simple primary alert β check it out!
</alert>
<alert color="secondary">
- A simple secondary alertβcheck it out!
+ A simple secondary alert β check it out!
</alert>
<alert color="success">
- A simple success alertβcheck it out!
+ A simple success alert β check it out!
</alert>
<alert color="danger">
- A simple danger alertβcheck it out!
+ A simple danger alert β check it out!
</alert>
<alert color="warning">
- A simple warning alertβcheck it out!
+ A simple warning alert β check it out!
</alert>
<alert color="info">
- A simple info alertβcheck it out!
+ A simple info alert β check it out!
</alert>
-<alert color="light">
- A simple light alertβcheck it out!
+<alert color="accent">
+ A simple accent alert β check it out!
</alert>
-<alert color="dark">
- A simple dark alertβcheck it out!
+<alert color="inverse">
+ A simple inverse alert β check it out!
</alert>
@@ -104,7 +104,7 @@
Alerts can also contain additional HTML elements like headings, paragraphs, icons and links.
-
+
Well done!
Aww yeah, you successfully read this important alert message. This example text with a
link is going to run a bit longer so that you can see how spacing within an alert works
@@ -115,7 +115,7 @@
outputclass
- <section outputclass="alert alert-success">
+ <section outputclass="alert theme-success vstack">
<title><i outputclass="bi bi-emoji-smile pe-2"/>Well done!</title>
<p>
Aww yeah, you successfully read this important alert message. This example text with a
@@ -129,7 +129,7 @@
Specialization
- <alert color="success">
+ <alert color="success" outputclass="vstack">
<title><icon outputclass="bi-emoji-smile" padding="e2"/>Well done!</title>
<p>
Aww yeah, you successfully read this important alert message. This example text with a
@@ -198,23 +198,23 @@
The default colors can be overridden by using a color attribute or an outputclass .
- This is a primary note.
- This is a secondary note.
- This is light note.
- This is dark note.
+ This is a primary note.
+ This is a secondary note.
+ This is accent note.
+ This is inverse note.
outputclass
- <note type="note" outputclass="alert-primary">
+ <note type="note" outputclass="theme-primary">
This is a primary note.</note>
-<note type="note" outputclass="alert-secondary">
+<note type="note" outputclass="theme-secondary">
This is a secondary note.</note>
-<note type="note" outputclass="alert-light">
- This is light note.
+<note type="note" outputclass="theme-accent">
+ This is accent note.
</note>
-<note type="note" outputclass="alert-dark">
- This is dark note.
+<note type="note" outputclass="theme-inverse">
+ This is inverse note.
</note>
@@ -225,11 +225,11 @@
<note color="secondary">
This is a secondary note.
</note>
-<note color="light">
- This is light note.
+<note color="accent">
+ This is accent note.
</note>
-<note color="dark">
- This is dark note.
+<note color="inverse">
+ This is inverse note.
</note>
diff --git a/sample/document.ditamap b/sample/document.ditamap
index 0c8db616..e648033f 100644
--- a/sample/document.ditamap
+++ b/sample/document.ditamap
@@ -11,7 +11,7 @@
Getting Started
-
+
@@ -19,7 +19,7 @@
Layout
-
+
@@ -30,7 +30,7 @@
Content
-
+
@@ -41,7 +41,7 @@
Components
-
+
@@ -64,7 +64,7 @@
Utilities
-
+
@@ -75,7 +75,7 @@
Extend
-
+
diff --git a/xsl/utility-classes.xsl b/xsl/utility-classes.xsl
index 358c4f9a..48d04636 100644
--- a/xsl/utility-classes.xsl
+++ b/xsl/utility-classes.xsl
@@ -11,14 +11,14 @@
exclude-result-prefixes="xs dita-ot"
>
-
+
-
+
@@ -51,7 +51,7 @@
- alert alert-
+ alert theme-
@@ -123,7 +123,7 @@
- alert p-0 alert-
+ alert p-0 theme-
@@ -329,7 +329,7 @@
- alert alert-
+ card theme-
@@ -477,11 +477,6 @@
else if (contains(@outputclass, 'btn-group-vertical')) then ''
else if (contains(@outputclass, 'btn-group')) then ''
else if (contains(@outputclass, 'btn-toolbar')) then ''
- else if (contains(@outputclass, 'accordion-')) then 'accordion'
- else if (contains(@outputclass, 'btn-')) then 'btn'
- else if (contains(@outputclass, 'collapse-')) then 'collapse'
- else if (contains(@outputclass, 'alert-')) then 'alert'
- else if (contains(@outputclass, 'list-group-')) then 'list-group'
else if (contains(@class, ' topic/fig ')) then ' figure ' || $BOOTSTRAP_CSS_FIGURE
else if (contains(@class, ' topic/lq ')) then ' blockquote '
else if (contains(@class, ' topic/dl ')) then $BOOTSTRAP_CSS_DL
@@ -597,26 +592,26 @@
alert
- alert-
+ theme-
From ce3e74aeed9eeea9ba43de3fe68f3174cf018279 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Tue, 28 Jul 2026 13:05:44 +0200
Subject: [PATCH 02/38] Fix badge
---
Customization/xsl/topic.xsl | 8 +++---
css/bootswatch-colors.css | 2 +-
css/common-bootstrap.css | 4 +--
includes/bootstrap.hdf.xml | 5 +++-
sample/badge.dita | 50 ++++++++++++++++++-------------------
xsl/utility-classes.xsl | 4 +--
6 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/Customization/xsl/topic.xsl b/Customization/xsl/topic.xsl
index 961add5b..72410d42 100644
--- a/Customization/xsl/topic.xsl
+++ b/Customization/xsl/topic.xsl
@@ -307,6 +307,7 @@
+
@@ -320,13 +321,14 @@
+ select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]/revprop"
+ mode="ditaval-outputflag"
+ />
+
svg {
diff --git a/includes/bootstrap.hdf.xml b/includes/bootstrap.hdf.xml
index e19a37d4..9045fc03 100644
--- a/includes/bootstrap.hdf.xml
+++ b/includes/bootstrap.hdf.xml
@@ -8,7 +8,10 @@
src="https://cdn.jsdelivr.net/npm/bootstrap@6.0.0-alpha1/dist/js/bootstrap.bundle.min.js"
integrity="sha384-Z+5YElvegGtTorgF5XlhCRkdTbU6SmOE+vvqYkVzGctueilwTIsac8hLXOvDlX3B" crossorigin="anonymous"
/-->
-
+
+
From c9ec97af2aea11f5864c37d5559be7a78add7670 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sat, 1 Aug 2026 13:59:49 +0200
Subject: [PATCH 21/38] Fix formatting
---
includes/bootstrap.hdf.xml | 5 ++++-
sample/icons.dita | 8 ++------
sample/typography.dita | 4 +---
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/includes/bootstrap.hdf.xml b/includes/bootstrap.hdf.xml
index 5d77697d..f6922e2b 100644
--- a/includes/bootstrap.hdf.xml
+++ b/includes/bootstrap.hdf.xml
@@ -12,5 +12,8 @@
href="https://v6-dev--twbs-bootstrap.netlify.app/docs/6.0/dist/css/bootstrap.min.css"
rel="stylesheet"
/>
-
+
diff --git a/sample/icons.dita b/sample/icons.dita
index d8b7754c..75553363 100644
--- a/sample/icons.dita
+++ b/sample/icons.dita
@@ -156,12 +156,8 @@
Icons can also be placed within buttons as shown:
-
-
+
+
diff --git a/sample/typography.dita b/sample/typography.dita
index 711ea719..5b3390b1 100644
--- a/sample/typography.dita
+++ b/sample/typography.dita
@@ -49,9 +49,7 @@
heading text from Bootstrap 3.
- Fancy display heading with faded secondary text
+ Fancy display heading with faded secondary text
<title>Fancy display heading <ph outputclass="fs-md fg-secondary">with faded secondary text</ph></title>
From 5068b96ef4c6764c94fa439daa8af0ddca6ff18a Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sat, 1 Aug 2026 14:06:46 +0200
Subject: [PATCH 22/38] Revert change
---
.github/dita-ot/theme.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/dita-ot/theme.css b/.github/dita-ot/theme.css
index fedc6130..b373f998 100644
--- a/.github/dita-ot/theme.css
+++ b/.github/dita-ot/theme.css
@@ -50,7 +50,7 @@
height: calc(100vh - 6rem);
}
-bg-body fg-body @media (max-width: 991.98px) {
+@media (max-width: 991.98px) {
.css-themes-list {
height: calc(100vh - 25rem);
}
From 673a773d5b603d9eec3ffe2433f67bb93539b59c Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sat, 1 Aug 2026 14:28:44 +0200
Subject: [PATCH 23/38] Remove ids
---
sample/accordion.dita | 8 ++++----
sample/alerts.dita | 12 ++++++------
sample/badge.dita | 4 ++--
sample/borders.dita | 16 ++++++++--------
sample/button-group.dita | 16 ++++++++--------
sample/buttons.dita | 12 ++++++------
sample/card.dita | 12 ++++++------
sample/carousel.dita | 32 ++++++++++++++++----------------
sample/collapse.dita | 4 ++--
sample/color.dita | 8 ++++----
sample/drawer.dita | 12 ++++++------
sample/grid.dita | 4 ++--
sample/icons.dita | 8 ++++----
sample/images.dita | 12 ++++++------
sample/list-group.dita | 12 ++++++------
sample/pagination.dita | 16 ++++++++--------
sample/popovers.dita | 8 ++++----
sample/shadows.dita | 4 ++--
sample/spacing.dita | 8 ++++----
sample/tables.dita | 40 ++++++++++++++++++++--------------------
sample/tabs.dita | 8 ++++----
sample/tooltips.dita | 8 ++++----
22 files changed, 132 insertions(+), 132 deletions(-)
diff --git a/sample/accordion.dita b/sample/accordion.dita
index 67d647e5..053e0efa 100644
--- a/sample/accordion.dita
+++ b/sample/accordion.dita
@@ -169,13 +169,13 @@
-
+
outputclass
<bodydiv outputclass="accordion-flush">
...etc
</bodydiv>
-
+
Specialization
<accordion flush="yes">
...etc
@@ -216,13 +216,13 @@
-
+
outputclass
<bodydiv outputclass="accordion-open">
...etc
</bodydiv>
-
+
Specialization
<accordion open="yes">
...etc
diff --git a/sample/alerts.dita b/sample/alerts.dita
index 825f08ce..02d7c58b 100644
--- a/sample/alerts.dita
+++ b/sample/alerts.dita
@@ -113,7 +113,7 @@
-
+
outputclass
<section outputclass="alert theme-success vstack">
<title><i outputclass="bi bi-emoji-smile pe-2"/>Well done!</title>
@@ -127,7 +127,7 @@
</p>
</section>
-
+
Specialization
<alert color="success" outputclass="vstack">
<title><icon outputclass="bi-emoji-smile" padding="e2"/>Well done!</title>
@@ -204,7 +204,7 @@
This is inverse note.
-
+
outputclass
<note type="note" outputclass="theme-primary">
This is a primary note.</note>
@@ -217,7 +217,7 @@
This is inverse note.
</note>
-
+
Specialization
<note color="primary">
This is a primary note.
@@ -243,7 +243,7 @@
>This note uses a styled smile emoji.
-
+
outputclass
<note otherprops="icon(bi-search)" type="other" othertype="Search">
This note has a search icon.
@@ -252,7 +252,7 @@
This note uses a styled smile emoji.
</note>
-
+
Specialization
<note icon="bi-search" type="other" othertype="Search">
This note has a search icon.
diff --git a/sample/badge.dita b/sample/badge.dita
index 0084afb3..b91986aa 100644
--- a/sample/badge.dita
+++ b/sample/badge.dita
@@ -71,7 +71,7 @@
-
+
outputclass
<ph outputclass="badge theme-primary">Primary</ph>
<ph outputclass="badge theme-secondary">Secondary</ph>
@@ -82,7 +82,7 @@
<ph outputclass="badge theme-accent">Accent</ph>
<ph outputclass="badge theme-inverse">Inverse</ph>
-
+
Specialization
<badge color="primary">Primary</badge>
<badge color="secondary">Secondary</badge>
diff --git a/sample/borders.dita b/sample/borders.dita
index 49021435..2cfe5f67 100644
--- a/sample/borders.dita
+++ b/sample/borders.dita
@@ -126,7 +126,7 @@
-
+
outputclass
<ph outputclass="border border-1">Width 1</ph>
<ph outputclass="border border-2">Width 2</ph>
@@ -134,7 +134,7 @@
<ph outputclass="border border-4">Width 4</ph>
<ph outputclass="border border-5">Width 5</ph>
-
+
Specialization
<ph border="1">Width 1</ph>
<ph border="2">Width 2</ph>
@@ -153,14 +153,14 @@
-
+
outputclass
<ph outputclass="border border-primary">Primary</ph>
<ph outputclass="border border-primary-subtle">Primary subtle</ph>
<ph outputclass="border border-success">Success</ph>
<ph outputclass="border border-danger">Danger</ph>
-
+
Specialization
<ph bordercolor="primary">Primary</ph>
<ph bordercolor="primary-subtle">Primary subtle</ph>
@@ -180,7 +180,7 @@
-
+
outputclass
<ph outputclass="border rounded-0">Rounded 0</ph>
<ph outputclass="border rounded-1">Rounded 1</ph>
@@ -189,7 +189,7 @@
<ph outputclass="border rounded-4">Rounded 4</ph>
<ph outputclass="border rounded-5">Rounded 5</ph>
-
+
Specialization
<ph border="yes" rounded="0">Rounded 0</ph>
<ph border="yes" rounded="1">Rounded 1</ph>
@@ -207,12 +207,12 @@
-
+
outputclass
<ph outputclass="border rounded-circle border-info">Circle</ph>
<ph outputclass="border rounded-pill border-warning">Pill</ph>
-
+
Specialization
<ph border="yes" rounded="circle" bordercolor="info">Circle</ph>
<ph border="yes" rounded="pill" bordercolor="warning">Pill</ph>
diff --git a/sample/button-group.dita b/sample/button-group.dita
index 176479f0..55fe6264 100644
--- a/sample/button-group.dita
+++ b/sample/button-group.dita
@@ -65,7 +65,7 @@
-
+
outputclass
<div outputclass="btn-group">
<xref outputclass="btn theme-danger" href="#">Left</xref>
@@ -73,7 +73,7 @@
<xref outputclass="btn theme-success" href="#">Right</xref>
</div>
-
+
Specialization
<button-group>
<button color="danger" href="#">Left</button>
@@ -93,7 +93,7 @@
-
+
outputclass
<div outputclass="btn-group">
<xref outputclass="btn-outline theme-primary" href="#">Left</xref>
@@ -101,7 +101,7 @@
<xref outputclass="btn-outline theme-primary" href="#">Right</xref>
</div>
-
+
Specialization
<button-group>
<button color="primary" outline="yes" href="#">Left</button>
@@ -133,7 +133,7 @@
-
+
outputclass
<div outputclass="btn-toolbar">
<div outputclass="btn-group me-2">
@@ -152,7 +152,7 @@
</div>
</div>
-
+
Specialization
<button-toolbar>
<button-group outputclass="me-2">
@@ -184,7 +184,7 @@
-
+
outputclass
<div outputclass="btn-group-vertical">
<xref outputclass="btn theme-primary" href="#">Top</xref>
@@ -192,7 +192,7 @@
<xref outputclass="btn theme-primary" href="#">Bottom</xref>
</div>
-
+
Specialization
<button-group vertical="yes">
<button color="primary" href="#">Top</button>
diff --git a/sample/buttons.dita b/sample/buttons.dita
index 29100ebf..342544fa 100644
--- a/sample/buttons.dita
+++ b/sample/buttons.dita
@@ -83,7 +83,7 @@
Inverse
-
+
outputclass
<xref href="#" outputclass="btn btn-outline theme-primary">Primary</xref>
<xref href="#" outputclass="btn-outline theme-secondary">Secondary</xref>
@@ -94,7 +94,7 @@
<xref href="#" outputclass="btn-outline theme-accent">Accent</xref>
<xref href="#" outputclass="btn-outline theme-inverse">Inverse</xref>
-
+
Specialization
<button href="#" outline="yes">Primary</button>
<button href="#" color="secondary" outline="yes">Secondary</button>
@@ -117,12 +117,12 @@
-
+
outputclass
<xref href="#" outputclass="btn theme-primary btn-lg">Large button</xref>
<xref href="#" outputclass="btn theme-secondary btn-lg">Large button</xref>
-
+
Specialization
<button href="#" size="large">Large button</button>
<button href="#" color="secondary" size="large">Large button</button>
@@ -135,12 +135,12 @@
-
+
outputclass
<xref href="#" outputclass="btn theme-primary btn-sm">Small button</xref>
<xref href="#" outputclass="btn theme-secondary btn-sm">Small button</xref>
-
+
Specialization
<button href="#" size="small">Small button</button>
<button href="#" color="secondary" size="small">Small button</button>
diff --git a/sample/card.dita b/sample/card.dita
index c823049f..ad9cc389 100644
--- a/sample/card.dita
+++ b/sample/card.dita
@@ -91,7 +91,7 @@
-
+
outputclass
<section outputclass="card w-50">
<title outputclass="h5">Card Title</title>
@@ -101,7 +101,7 @@
<xref outputclass="card-link" href="#">Another Link</xref>
</section>
-
+
Specialization
<card>
<title>Card Title</title>
@@ -129,14 +129,14 @@
-
+
outputclass
<section outputclass="card w-50">
<image outputclass="card-img-top" href="..." />
<p>Some quick example text to build on the card title and make up the bulk of the cardβs content.</p>
</section>
-
+
Specialization
<card>
<image href="..." />
@@ -160,7 +160,7 @@
-
+
outputclass
<section outputclass="card w-50">
<div outputclass="card-header">Featured</div>
@@ -169,7 +169,7 @@
<xref href="#" outputclass="btn-primary">Go somewhere</xref>
</section>
-
+
Specialization
<card>
<card-header>Featured</card-header>
diff --git a/sample/carousel.dita b/sample/carousel.dita
index c9f4d05f..0ac2b96e 100644
--- a/sample/carousel.dita
+++ b/sample/carousel.dita
@@ -101,7 +101,7 @@
-
+
outputclass
<ol outputclass="carousel" otherprops="indicators(true)">
<li>
@@ -115,7 +115,7 @@
</li>
</ol>
-
+
Specialization
<carousel indicators="yes">
<carousel-item>
@@ -157,7 +157,7 @@
-
+
outputclass
<ol outputclass="carousel">
<li>
@@ -180,7 +180,7 @@
</li>
</ol>
-
+
Specialization
<carousel>
<carousel-item>
@@ -259,7 +259,7 @@ And, kept unused, the user so destroys it.
-
+
outputclass
<ol outputclass="carousel">
<li>
@@ -288,7 +288,7 @@ And, kept unused, the user so destroys it.
</li>
</ol>
-
+
Specialization
<carousel>
<carousel-item>
@@ -343,7 +343,7 @@ And, kept unused, the user so destroys it.
-
+
outputclass
<ol outputclass="carousel">
<li>
@@ -363,7 +363,7 @@ And, kept unused, the user so destroys it.
</li>
</ol>
-
+
Specialization
<carousel>
<carousel-item>
@@ -483,7 +483,7 @@ And, kept unused, the user so destroys it.
-
+
outputclass
<ol outputclass="carousel-fade">
<li>
@@ -497,7 +497,7 @@ And, kept unused, the user so destroys it.
</li>
</ol>
-
+
Specialization
<carousel fade="yes">
<carousel-item>
@@ -534,7 +534,7 @@ And, kept unused, the user so destroys it.
-
+
outputclass
<ol outputclass="carousel" otherprops="autoplay(false)">
<li>
@@ -548,7 +548,7 @@ And, kept unused, the user so destroys it.
</li>
</ol>
-
+
Specialization
<carousel autoplay="no">
<carousel-item>
@@ -604,7 +604,7 @@ And, kept unused, the user so destroys it.
-
+
outputclass
<ol outputclass="carousel">
<li otherprops="interval(2000)">
@@ -618,7 +618,7 @@ And, kept unused, the user so destroys it.
</li>
</ol>
-
+
Specialization
<carousel>
<carousel-item interval="2000">
@@ -652,7 +652,7 @@ And, kept unused, the user so destroys it.
-
+
outputclass
<ol outputclass="carousel" otherprops="touch(false)">
<li>
@@ -666,7 +666,7 @@ And, kept unused, the user so destroys it.
</li>
</ol>
-
+
Specialization
<carousel touch="no">
<carousel-item>
diff --git a/sample/collapse.dita b/sample/collapse.dita
index 9b3beb19..529edaf2 100644
--- a/sample/collapse.dita
+++ b/sample/collapse.dita
@@ -88,7 +88,7 @@
-
+
outputclass
<p>
<xref outputclass="btn-primary" props="collapse-toggle" href="#collapse2">Toggle Width Collapse</xref>
@@ -99,7 +99,7 @@
</div>
</bodydiv>
-
+
Specialization
<p>
<button props="collapse-toggle" href="#collapse2">Toggle Width Collapse</button>
diff --git a/sample/color.dita b/sample/color.dita
index 8d004fd4..06bd774c 100644
--- a/sample/color.dita
+++ b/sample/color.dita
@@ -118,7 +118,7 @@
-
+
outputclass
<section outputclass="bg-primary fg-contrast-primary">
<title>Section Decoration</title>
@@ -168,7 +168,7 @@
...
</note>
-
+
Specialization
<section color="primary">
<title>Section Decoration</title>
@@ -259,7 +259,7 @@
-
+
outputclass
<img src="..." class="img-thumbnail bg-warning"/>
@@ -279,7 +279,7 @@
...
</ul>
-
+
Specialization
<thumbnail href="..." color="warning"/>
diff --git a/sample/drawer.dita b/sample/drawer.dita
index ce1bf623..5f48e78d 100644
--- a/sample/drawer.dita
+++ b/sample/drawer.dita
@@ -108,13 +108,13 @@
-
+
outputclass
<section outputclass="drawer-end" id="drawer2">
...etc
</section>
-
+
Specialization
<drawer position="end">
...etc
@@ -129,13 +129,13 @@
-
+
outputclass
<section outputclass="drawer-bottom" id="drawer3">
...etc
</section>
-
+
Specialization
<drawer position="bottom">
...etc
@@ -167,7 +167,7 @@
outputclass="drawer-xxl"
-
+
outputclass
<note outputclass="d-none lg:d-block">
Resize your browser to show the responsive drawer toggle.
@@ -182,7 +182,7 @@
</p>
</section>
-
+
Specialization
<note color="info" outputclass="d-none lg:d-block">
Resize your browser to show the responsive drawer toggle.
diff --git a/sample/grid.dita b/sample/grid.dita
index 2887f518..e7a570d4 100644
--- a/sample/grid.dita
+++ b/sample/grid.dita
@@ -103,7 +103,7 @@
-
+
outputclass
<bodydiv outputclass="row">
<bodydiv outputclass="col">
@@ -125,7 +125,7 @@
</bodydiv>
</bodydiv>
-
+
Specialization
<grid-row>
<grid-col>
diff --git a/sample/icons.dita b/sample/icons.dita
index 75553363..f69f4c8c 100644
--- a/sample/icons.dita
+++ b/sample/icons.dita
@@ -98,7 +98,7 @@
-
+
outputclass
<xref outputclass="link theme-primary" href="#">
<i outputclass="bi-link"/> Primary link
@@ -126,7 +126,7 @@
</xref>
-
+
Specialization
<xref color="primary" href="#">
<icon outputclass="bi-link"/> Primary link
@@ -164,7 +164,7 @@
-
+
outputclass
<xref outputclass="theme-primary btn-icon" href="#">
<i outputclass="bi-arrow-down-square-fill"/>
@@ -185,7 +185,7 @@
<i outputclass="bi-share-fill"/>
</xref>
-
+
Specialization
<button color="primary" outputclass="btn-icon" href="#">
<icon outputclass="bi-arrow-down-square-fill"/>
diff --git a/sample/images.dita b/sample/images.dita
index 8d0bd65d..cf104d78 100644
--- a/sample/images.dita
+++ b/sample/images.dita
@@ -79,7 +79,7 @@
-
+
outputclass
<fig>
<image outputclass="img-thumbnail d-auto" href="..."/>
@@ -87,7 +87,7 @@
<image outputclass="img-thumbnail d-dark" href="..." deliveryTarget="html"/>
</fig>
-
+
Specialization
<fig>
<thumbnail outputclass="d-auto" href="..."/>
@@ -103,11 +103,11 @@
-
+
outputclass
<image otherprops="loading(lazy)" href="..."/>
-
+
Specialization
<image loading="lazy" href="..."/>
@@ -130,7 +130,7 @@
-
+
outputclass
<div outputclass="d-picture">
<image otherprops="media(min-width: 700px)" href="..."/>
@@ -140,7 +140,7 @@
<image href="..."/>
</div>
-
+
Specialization
<picture>
<image media="min-width: 700px" href="..."/>
diff --git a/sample/list-group.dita b/sample/list-group.dita
index c2369dee..e47f492f 100644
--- a/sample/list-group.dita
+++ b/sample/list-group.dita
@@ -74,13 +74,13 @@
-
+
outputclass
<ul outputclass="list-group" compact="yes" >
...
</ul>
-
+
Specialization
<list-group compact="yes">
...
@@ -99,13 +99,13 @@
-
+
outputclass
<ul outputclass="list-group" compact="no" >
...
</ul>
-
+
Specialization
<list-group compact="no">
...
@@ -127,7 +127,7 @@
-
+
outputclass
<ul outputclass="list-group-flush">
<li>An item</li>
@@ -137,7 +137,7 @@
<li>And a fifth one</li>
</ul>
-
+
Specialization
<list-group flush="yes">
<li>An item</li>
diff --git a/sample/pagination.dita b/sample/pagination.dita
index ab0eb26e..c9f16c0f 100644
--- a/sample/pagination.dita
+++ b/sample/pagination.dita
@@ -113,7 +113,7 @@
-
+
outputclass
<section>
<title>Page navigation example</title>
@@ -126,7 +126,7 @@
</ol>
</section>
-
+
Specialization
<pagination size="large">
<title>Page navigation example</title>
@@ -163,7 +163,7 @@
-
+
outputclass
<section>
<title>Page navigation example</title>
@@ -176,7 +176,7 @@
</ol>
</section>
-
+
Specialization
<pagination size="small">
<title>Page navigation example</title>
@@ -224,7 +224,7 @@
-
+
outputclass
<section>
<title>Page navigation example</title>
@@ -237,7 +237,7 @@
</ol>
</section>
-
+
Specialization
<pagination outputclass="justify-content-center">
<title>Page navigation example</title>
@@ -274,7 +274,7 @@
-
+
outputclass
<section>
<title>Page navigation example</title>
@@ -287,7 +287,7 @@
</ol>
</section>
-
+
Specialization
<pagination outputclass="justify-content-end">
<title>Page navigation example</title>
diff --git a/sample/popovers.dita b/sample/popovers.dita
index 23070357..2c046865 100644
--- a/sample/popovers.dita
+++ b/sample/popovers.dita
@@ -94,7 +94,7 @@
Left popover Popover on left
-
+
outputclass
<xref href="#" outputclass="btn-secondary popover-top">
<desc>Top popover</desc>
@@ -113,7 +113,7 @@
Popover on left
</xref>
-
+
Specialization
<popover outputclass="btn-secondary" position="top">
<desc>Top popover</desc>
@@ -155,7 +155,7 @@
And hereβs some amazing content. Itβs very engaging. Right? Custom popover
-
+
outputclass
<xref href="#" outputclass="btn-lg btn-danger popover-top">
<data name="title">Popover title</data>
@@ -164,7 +164,7 @@
Custom popover
</xref>
-
+
Specialization
<popover outputclass="btn-lg btn-danger">
<data name="title">Popover title</data>
diff --git a/sample/shadows.dita b/sample/shadows.dita
index 52fc7057..d5bde6f6 100644
--- a/sample/shadows.dita
+++ b/sample/shadows.dita
@@ -64,7 +64,7 @@
-
+
outputclass
<section outputclass="card shadow-lg m-3 bg-subtle-accent">
<div outputclass="card-body">
@@ -75,7 +75,7 @@
<div outputclass="alert theme-accent m-3 shadow-sm">Alert with small shadow</div>
-
+
Specialization
<card shadow="lg" margin="3" color="accent">
<title>Shadowed Card</title>
diff --git a/sample/spacing.dita b/sample/spacing.dita
index 55ddf633..e2c03356 100644
--- a/sample/spacing.dita
+++ b/sample/spacing.dita
@@ -86,7 +86,7 @@
-
+
outputclass
<div outputclass="bg-primary p-0">Padding 0</div>
<div outputclass="bg-secondary p-1 m-1">Padding 1</div>
@@ -95,7 +95,7 @@
<div outputclass="bg-warning p-4 m-1">Padding 4</div>
<div outputclass="bg-info p-5 m-1">Padding 5</div>
-
+
Specialization
<div color="primary" padding="0">Padding 0</div>
<div color="secondary" padding="1" margin="1">Padding 1</div>
@@ -133,14 +133,14 @@
-
+
outputclass
<div outputclass="bg-primary mt-5 mb-0">Margin Top 5, Bottom 0</div>
<div outputclass="bg-secondary mx-3">Margin Horizontal 3</div>
<div outputclass="bg-success py-5">Padding Vertical 5</div>
<div outputclass="bg-danger ps-3 pe-1">Padding Start 3, End 1</div>
-
+
Specialization
<div color="primary" margin="t5 b0">Margin Top 5, Bottom 0</div>
<div color="secondary" margin="x3">Margin Horizontal 3</div>
diff --git a/sample/tables.dita b/sample/tables.dita
index d9d4d2da..9626d018 100644
--- a/sample/tables.dita
+++ b/sample/tables.dita
@@ -142,7 +142,7 @@
-
+
outputclass
<table outputclass="theme-primary p-1 w-100">
<tgroup cols="2">
@@ -173,7 +173,7 @@
</tgroup>
</table>
-
+
Specialization
<table color="primary" padding="1" width="100">
<tgroup cols="2">
@@ -243,13 +243,13 @@
-
+
outputclass
<table outputclass="table-striped">
...etc
</table>
-
+
Specialization
<table striped="yes">
...etc
@@ -294,13 +294,13 @@
-
+
outputclass
<table outputclass="table-striped-columns">
...etc
</table>
-
+
Specialization
<table striped-columns="yes">
...etc
@@ -345,13 +345,13 @@
-
+
outputclass
<table rowsep="1" colsep="1">
...etc
</table>
-
+
Specialization
<table rowsep="1" colsep="1">
...etc
@@ -395,13 +395,13 @@
-
+
outputclass
<table rowsep="0" colsep="0">
...etc
</table>
-
+
Specialization
<table rowsep="0" colsep="0">
...etc
@@ -446,13 +446,13 @@
-
+
outputclass
<table outputclass="table-sm">
...etc
</table>
-
+
Specialization
<table compact="yes">
...etc
@@ -497,13 +497,13 @@
-
+
outputclass
<tbody outputclass="table-group-divider">
...etc
</tbody>
-
+
Specialization
<table divider="yes">
...
@@ -566,7 +566,7 @@
-
+
outputclass
<table outputclass="align-middle">
<tgroup cols="4">
@@ -595,7 +595,7 @@
</tgroup>
</table>
-
+
Specialization
<table outputclass="align-middle">
<tgroup cols="4">
@@ -664,7 +664,7 @@
-
+
outputclass
<table>
<tgroup>
@@ -674,7 +674,7 @@
</tgroup>
</table>
-
+
Specialization
<table>
<tgroup>
@@ -718,7 +718,7 @@
-
+
outputclass
<table>
<tgroup>
@@ -728,7 +728,7 @@
</tgroup>
</table>
-
+
Specialization
<table>
<tgroup>
diff --git a/sample/tabs.dita b/sample/tabs.dita
index 30fe1148..9a97e624 100644
--- a/sample/tabs.dita
+++ b/sample/tabs.dita
@@ -126,7 +126,7 @@
-
+
outputclass
<bodydiv outputclass="nav-pills">
<section>
@@ -143,7 +143,7 @@
</section>
</bodydiv>
-
+
Specialization
<tabbed-dialog style="pills">
<section>
@@ -192,7 +192,7 @@
-
+
outputclass
<bodydiv outputclass="nav-pills-vertical">
<section>
@@ -209,7 +209,7 @@
</section>
</bodydiv>
-
+
Specialization
<tabbed-dialog style="vertical-pills">
<section>
diff --git a/sample/tooltips.dita b/sample/tooltips.dita
index 974a4af3..1352474a 100644
--- a/sample/tooltips.dita
+++ b/sample/tooltips.dita
@@ -126,14 +126,14 @@
DITA elements Tooltip with embedded DITA
-
+
outputclass
<xref href="#" outputclass="btn-secondary tooltip-top">
<desc><b>Tooltip</b> <u>with</u> <b>DITA</b> elements</desc>
Tooltip with embedded DITA
</xref>
-
+
Specialization
<tooltip outputclass="btn-secondary">
<desc><b>Tooltip</b> <u>with</u> <b>DITA</b> elements</desc>
@@ -157,7 +157,7 @@ Tooltip with embedded DITA
-
+
outputclass
<xref href="#" outputclass="btn-secondary tooltip-top">
<data name="class">custom-tooltip</data>
@@ -165,7 +165,7 @@ Tooltip with embedded DITA
Custom tooltip
</xref>
-
+
Specialization
<tooltip outputclass="btn-secondary">
<data name="class">custom-tooltip</data>
From 768cf3f8dd96178c1bdb77311a9ee10c32bda5f1 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sat, 1 Aug 2026 14:45:13 +0200
Subject: [PATCH 24/38] fixing footer
---
.github/dita-ot/footer.xml | 18 +++----
includes/ftr.content.example.xml | 92 ++++++++++++++++----------------
2 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/.github/dita-ot/footer.xml b/.github/dita-ot/footer.xml
index f5461b84..34491f42 100644
--- a/.github/dita-ot/footer.xml
+++ b/.github/dita-ot/footer.xml
@@ -6,44 +6,44 @@
- Β© 2017β2025
+ Β© 2017β2026
infotexture
diff --git a/includes/ftr.content.example.xml b/includes/ftr.content.example.xml
index 6a8d33c0..59b1e7da 100644
--- a/includes/ftr.content.example.xml
+++ b/includes/ftr.content.example.xml
@@ -7,138 +7,138 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -147,7 +147,7 @@
commodi optio pariatur est quia magnam eum harum corrupti dicta,
aliquam sequi voluptate quas.
- Β© 2025
+ Β© 2026
From 921c98f7ca5befea66cbb66594a8840b07cb3a67 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sat, 1 Aug 2026 15:04:38 +0200
Subject: [PATCH 25/38] Amend links
---
sample/accordion.dita | 4 ++--
sample/alerts.dita | 2 +-
sample/badge.dita | 2 +-
sample/bootstrap-table.dita | 2 +-
sample/borders.dita | 2 +-
sample/breadcrumb.dita | 2 +-
sample/button-group.dita | 2 +-
sample/buttons.dita | 2 +-
sample/card.dita | 6 +++---
sample/carousel.dita | 2 +-
sample/containers.dita | 2 +-
sample/dark-mode.dita | 2 +-
sample/drawer.dita | 2 +-
sample/extension-points.dita | 2 +-
sample/grid.dita | 2 +-
sample/images.dita | 4 ++--
sample/index.dita | 28 ++++++++++++++--------------
sample/list-group.dita | 2 +-
sample/nav.dita | 10 +++++-----
sample/offline.dita | 2 +-
sample/pagination.dita | 4 ++--
sample/popovers.dita | 2 +-
sample/rtl.dita | 2 +-
sample/sass.dita | 2 +-
sample/scrollspy.dita | 2 +-
sample/search-box.dita | 2 +-
sample/tables.dita | 2 +-
sample/tabs.dita | 2 +-
sample/tooltips.dita | 2 +-
sample/typography.dita | 2 +-
30 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/sample/accordion.dita b/sample/accordion.dita
index 053e0efa..634b071c 100644
--- a/sample/accordion.dita
+++ b/sample/accordion.dita
@@ -1,7 +1,7 @@
diff --git a/sample/search-box.dita b/sample/search-box.dita
index 5149026a..fdc8abe0 100644
--- a/sample/search-box.dita
+++ b/sample/search-box.dita
@@ -2,7 +2,7 @@
From 7a4c94669a4e193bda8d53f165b64710e1fd28bc Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sat, 1 Aug 2026 18:51:37 +0200
Subject: [PATCH 26/38] 5.3 -> 6.0
---
sample/accordion.dita | 2 +-
sample/alerts.dita | 2 +-
sample/badge.dita | 2 +-
sample/bootstrap-table.dita | 2 +-
sample/borders.dita | 2 +-
sample/breadcrumb.dita | 2 +-
sample/button-group.dita | 2 +-
sample/buttons.dita | 2 +-
sample/card.dita | 2 +-
sample/carousel.dita | 2 +-
sample/containers.dita | 2 +-
sample/dark-mode.dita | 2 +-
sample/drawer.dita | 2 +-
sample/extension-points.dita | 2 +-
sample/grid.dita | 2 +-
sample/images.dita | 2 +-
sample/index.dita | 2 +-
sample/list-group.dita | 2 +-
sample/nav.dita | 2 +-
sample/offline.dita | 2 +-
sample/pagination.dita | 2 +-
sample/popovers.dita | 2 +-
sample/rtl.dita | 2 +-
sample/sass.dita | 2 +-
sample/scrollspy.dita | 2 +-
sample/search-box.dita | 2 +-
sample/tables.dita | 2 +-
sample/tabs.dita | 2 +-
sample/tooltips.dita | 2 +-
sample/typography.dita | 2 +-
30 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/sample/accordion.dita b/sample/accordion.dita
index 634b071c..f78c2f94 100644
--- a/sample/accordion.dita
+++ b/sample/accordion.dita
@@ -1,7 +1,7 @@
diff --git a/sample/search-box.dita b/sample/search-box.dita
index fdc8abe0..b1a8d254 100644
--- a/sample/search-box.dita
+++ b/sample/search-box.dita
@@ -2,7 +2,7 @@
From 7cedbe5ebc34ca7fa1545764e9ef1a3bc88d8ae5 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 11:00:39 +0200
Subject: [PATCH 27/38] Add v5/v6 builds to CI
---
.github/dita-ot/html.xml | 2 +-
.github/workflows/ci.yml | 23 ++++++++++++++++++-----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/.github/dita-ot/html.xml b/.github/dita-ot/html.xml
index 8bafb2eb..a10ff8da 100644
--- a/.github/dita-ot/html.xml
+++ b/.github/dita-ot/html.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 59ba2695..66029879 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,8 @@ name: CI
branches:
- master
- develop
+ - v5
+ - v6
workflow_dispatch:
jobs:
@@ -13,7 +15,6 @@ jobs:
steps:
- name: Git checkout
uses: actions/checkout@v7
-
- name: Calculate short SHA
uses: benjlevesque/short-sha@v4.0
id: short-sha
@@ -25,7 +26,6 @@ jobs:
- run: echo $SHA
env:
SHA: ${{ env.SHA }}
-
- name: Build Bootstrap
uses: dita-ot/dita-ot-action@4.4
with:
@@ -43,13 +43,26 @@ jobs:
fox.jason.open-graph
https://github.com/dita-bootstrap/dita-bootstrap.theme-switcher/archive/develop.zip
project: .github/dita-ot/html.xml
-
+ # 1. Determine target directory dynamically based on current branch
+ - name: Determine target folder π
+ id: set-target
+ run: |
+ if [ "${{ github.ref_name }}" = "master" ] || [ "${{ github.ref_name }}" = "develop" ]; then
+ echo "target_dir=" >> $GITHUB_OUTPUT
+ else
+ echo "target_dir=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+ fi
+ # 2. Deploy to the dynamically resolved folder
- name: Deploy HTML π
uses: JamesIves/github-pages-deploy-action@v4.8.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages # The branch the action should deploy to.
folder: out/html # The folder the action should deploy.
- commit-message: 'π Deploy ${{ env.SHA }} to GitHub Pages'
+ target-folder: ${{ steps.set-target.outputs.target_dir }}
+ commit-message: 'π Deploy ${{ env.SHA }} to GitHub Pages (${{ github.ref_name }})'
git-config-name: 'GitHub Action'
- git-config-email: 'action@github.com'
+ # Prevent root deployments (master/develop) from cleaning versioned subfolders
+ clean-exclude: |
+ v5
+ v6
From 7509f99a90593206114b88e2da3fe84636a11d9b Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 11:13:09 +0200
Subject: [PATCH 28/38] Build with v6
---
.github/workflows/ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66029879..b434e1fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,8 @@ jobs:
nodejs -v
plugins: |
fox.jason.extend.css
- https://github.com/dita-bootstrap/dita-bootstrap.html/archive/develop.zip
- https://github.com/dita-bootstrap/dita-bootstrap.lunr/archive/develop.zip
+ https://github.com/dita-bootstrap/dita-bootstrap.html/archive/v6.zip
+ https://github.com/dita-bootstrap/dita-bootstrap.lunr/archive/v6.zip
https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip
fox.jason.favicon
fox.jason.open-graph
From cdf796b7d8e5e2bbae485178863435a03d629775 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 11:18:47 +0200
Subject: [PATCH 29/38] Use gitref name
---
.github/workflows/ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b434e1fe..733f2ed1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,8 @@ jobs:
nodejs -v
plugins: |
fox.jason.extend.css
- https://github.com/dita-bootstrap/dita-bootstrap.html/archive/v6.zip
- https://github.com/dita-bootstrap/dita-bootstrap.lunr/archive/v6.zip
+ https://github.com/dita-bootstrap/dita-bootstrap.html/archive/${{ github.ref_name }}.zip
+ https://github.com/dita-bootstrap/dita-bootstrap.lunr/archive/${{ github.ref_name }}.zip
https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip
fox.jason.favicon
fox.jason.open-graph
From 796b936b925dbce0da5ec30c51b9dcbd625c0a28 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 11:23:33 +0200
Subject: [PATCH 30/38] Use forked repo for testing.
---
.github/workflows/ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 733f2ed1..eda90385 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,8 @@ jobs:
nodejs -v
plugins: |
fox.jason.extend.css
- https://github.com/dita-bootstrap/dita-bootstrap.html/archive/${{ github.ref_name }}.zip
- https://github.com/dita-bootstrap/dita-bootstrap.lunr/archive/${{ github.ref_name }}.zip
+ https://github.com/jason-fox/dita-bootstrap.html/archive/${{ github.ref_name }}.zip
+ https://github.com/jason-fox/dita-bootstrap.lunr/archive/${{ github.ref_name }}.zip
https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip
fox.jason.favicon
fox.jason.open-graph
From 2bb8b10a39b0dc0014d8cd0b66d8bdfff878b59b Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 11:28:05 +0200
Subject: [PATCH 31/38] Generalise build
---
.github/workflows/ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eda90385..e50ae0e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,8 @@ jobs:
nodejs -v
plugins: |
fox.jason.extend.css
- https://github.com/jason-fox/dita-bootstrap.html/archive/${{ github.ref_name }}.zip
- https://github.com/jason-fox/dita-bootstrap.lunr/archive/${{ github.ref_name }}.zip
+ https://github.com/${{ github.repository_owner }}/dita-bootstrap.html/archive/${{ github.ref_name }}.zip
+ https://github.com/${{ github.repository_owner }}/dita-bootstrap.lunr/archive/${{ github.ref_name }}.zip
https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip
fox.jason.favicon
fox.jason.open-graph
From 5f8f1792ca5bcd57efd07c97a44cb4695ad90488 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 12:27:16 +0200
Subject: [PATCH 32/38] Generalise further
---
.github/workflows/ci.yml | 59 +++++++++++++++++++++++++++++++---------
1 file changed, 46 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e50ae0e6..3ad5b908 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,7 @@ jobs:
steps:
- name: Git checkout
uses: actions/checkout@v7
+
- name: Calculate short SHA
uses: benjlevesque/short-sha@v4.0
id: short-sha
@@ -26,6 +27,44 @@ jobs:
- run: echo $SHA
env:
SHA: ${{ env.SHA }}
+
+ # 1. Resolve Plugin URLs dynamically with fallback
+ - name: Resolve Plugin URLs π
+ id: plugins
+ run: |
+ owner="${{ github.repository_owner }}"
+ ref="${{ github.ref_name }}"
+
+ # Function to check URL existence and return fallback on failure
+ get_plugin_url() {
+ local repo=$1
+ local target_url="https://github.com/${owner}/${repo}/archive/${ref}.zip"
+
+ # -s (silent), -f (fail on 4xx), -I (HEAD request), -L (follow redirects)
+ if curl -sfIL "$target_url" >/dev/null; then
+ echo "$target_url"
+ else
+ echo "https://github.com/dita-bootstrap/${repo}/archive/develop.zip"
+ fi
+ }
+
+ HTML_URL=$(get_plugin_url "dita-bootstrap.html")
+ LUNR_URL=$(get_plugin_url "dita-bootstrap.lunr")
+ THEME_URL=$(get_plugin_url "dita-bootstrap.theme-switcher")
+
+ # Generate multiline output list for the plugins
+ EOF=$(dd if=/dev/urandom bs=15 count=1 2>/dev/null | base64 | tr -dc 'a-zA-Z0-9')
+ echo "list<<$EOF" >> $GITHUB_OUTPUT
+ echo "fox.jason.extend.css" >> $GITHUB_OUTPUT
+ echo "$HTML_URL" >> $GITHUB_OUTPUT
+ echo "$LUNR_URL" >> $GITHUB_OUTPUT
+ echo "https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip" >> $GITHUB_OUTPUT
+ echo "fox.jason.favicon" >> $GITHUB_OUTPUT
+ echo "fox.jason.open-graph" >> $GITHUB_OUTPUT
+ echo "$THEME_URL" >> $GITHUB_OUTPUT
+ echo "$EOF" >> $GITHUB_OUTPUT
+
+ # 2. Build Bootstrap using the resolved list
- name: Build Bootstrap
uses: dita-ot/dita-ot-action@4.4
with:
@@ -34,16 +73,10 @@ jobs:
export DEBIAN_FRONTEND=noninteractive
apt-get install -qy --no-install-recommends nodejs
nodejs -v
- plugins: |
- fox.jason.extend.css
- https://github.com/${{ github.repository_owner }}/dita-bootstrap.html/archive/${{ github.ref_name }}.zip
- https://github.com/${{ github.repository_owner }}/dita-bootstrap.lunr/archive/${{ github.ref_name }}.zip
- https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip
- fox.jason.favicon
- fox.jason.open-graph
- https://github.com/dita-bootstrap/dita-bootstrap.theme-switcher/archive/develop.zip
+ plugins: ${{ steps.plugins.outputs.list }}
project: .github/dita-ot/html.xml
- # 1. Determine target directory dynamically based on current branch
+
+ # 3. Determine target folder dynamically based on current branch
- name: Determine target folder π
id: set-target
run: |
@@ -52,17 +85,17 @@ jobs:
else
echo "target_dir=${{ github.ref_name }}" >> $GITHUB_OUTPUT
fi
- # 2. Deploy to the dynamically resolved folder
+
+ # 4. Deploy to the dynamically resolved folder
- name: Deploy HTML π
uses: JamesIves/github-pages-deploy-action@v4.8.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- branch: gh-pages # The branch the action should deploy to.
- folder: out/html # The folder the action should deploy.
+ branch: gh-pages
+ folder: out/html
target-folder: ${{ steps.set-target.outputs.target_dir }}
commit-message: 'π Deploy ${{ env.SHA }} to GitHub Pages (${{ github.ref_name }})'
git-config-name: 'GitHub Action'
- # Prevent root deployments (master/develop) from cleaning versioned subfolders
clean-exclude: |
v5
v6
From 9ee8fa88cd4ecf4e8523c3d9164b36099bca02ae Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 12:43:26 +0200
Subject: [PATCH 33/38] Add badge
---
.github/dita-ot/header.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/dita-ot/header.xml b/.github/dita-ot/header.xml
index d2d8a335..5e54209d 100644
--- a/.github/dita-ot/header.xml
+++ b/.github/dita-ot/header.xml
@@ -23,7 +23,7 @@
d="M0 4a4 4 0 0 1 4-4h8a4 4 0 0 1 4 4v8a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4zm4-3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3H4z"
/>
- DITA Bootstrap
+ DITA Bootstrap v6
From 579dc65dda51472aef540cb31760dcb9d165a238 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 12:51:54 +0200
Subject: [PATCH 34/38] Tweak container
---
.github/dita-ot/header.xml | 2 +-
xsl/dita2html5-bootstrapImpl_template.xsl | 2 +-
xsl/dita2html5-legacy-3.0_template.xsl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/dita-ot/header.xml b/.github/dita-ot/header.xml
index 5e54209d..d48e9da1 100644
--- a/.github/dita-ot/header.xml
+++ b/.github/dita-ot/header.xml
@@ -23,7 +23,7 @@
d="M0 4a4 4 0 0 1 4-4h8a4 4 0 0 1 4 4v8a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4zm4-3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3H4z"
/>
- DITA Bootstrap v6
+ DITA Bootstrap v6
diff --git a/xsl/dita2html5-bootstrapImpl_template.xsl b/xsl/dita2html5-bootstrapImpl_template.xsl
index e173a008..529959b6 100644
--- a/xsl/dita2html5-bootstrapImpl_template.xsl
+++ b/xsl/dita2html5-bootstrapImpl_template.xsl
@@ -16,7 +16,7 @@
-
+
diff --git a/xsl/dita2html5-legacy-3.0_template.xsl b/xsl/dita2html5-legacy-3.0_template.xsl
index b3bebe1c..c9c80a1a 100644
--- a/xsl/dita2html5-legacy-3.0_template.xsl
+++ b/xsl/dita2html5-legacy-3.0_template.xsl
@@ -16,7 +16,7 @@
-
+
From 361550ed1be6216cccd0f57752b6232a26517720 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 13:14:42 +0200
Subject: [PATCH 35/38] Tweak badge
---
.github/dita-ot/header.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/dita-ot/header.xml b/.github/dita-ot/header.xml
index d48e9da1..4d1e8381 100644
--- a/.github/dita-ot/header.xml
+++ b/.github/dita-ot/header.xml
@@ -23,7 +23,7 @@
d="M0 4a4 4 0 0 1 4-4h8a4 4 0 0 1 4 4v8a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4zm4-3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3H4z"
/>
- DITA Bootstrap v6
+ DITA Bootstrap v6
From 1ffde1c64ca880f11f3cc13783097774d179cd09 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 13:22:59 +0200
Subject: [PATCH 36/38] formatting
---
.github/dita-ot/header.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/dita-ot/header.xml b/.github/dita-ot/header.xml
index 4d1e8381..41eecbd6 100644
--- a/.github/dita-ot/header.xml
+++ b/.github/dita-ot/header.xml
@@ -23,7 +23,9 @@
d="M0 4a4 4 0 0 1 4-4h8a4 4 0 0 1 4 4v8a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4zm4-3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3H4z"
/>
- DITA Bootstrap v6
+ DITA Bootstrap v6
From e610229edc37cc9a4a71b2b0eb47fd2818800475 Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 13:40:35 +0200
Subject: [PATCH 37/38] Increase font-size
---
.github/dita-ot/theme.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/dita-ot/theme.css b/.github/dita-ot/theme.css
index b373f998..f9b79914 100644
--- a/.github/dita-ot/theme.css
+++ b/.github/dita-ot/theme.css
@@ -39,6 +39,7 @@
--bs-navbar-bg: var(--bs-primary-bg);
--bs-navbar-color: var(--bs-primary-contrast);
--bs-navbar-brand-color: var(--bs-primary-contrast);
+ --bs-navbar-brand-font-size: 1.25rem;
}
.nav-link {
From 8610534493014ff0551020765368d2deb3c49f6a Mon Sep 17 00:00:00 2001
From: Jason Fox
Date: Sun, 2 Aug 2026 17:03:58 +0200
Subject: [PATCH 38/38] Amend CSS variables
---
.github/dita-ot/theme.css | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/dita-ot/theme.css b/.github/dita-ot/theme.css
index f9b79914..59f374c3 100644
--- a/.github/dita-ot/theme.css
+++ b/.github/dita-ot/theme.css
@@ -18,20 +18,20 @@
.custom-popover {
--bs-popover-max-width: 200px;
- --bs-popover-border-color: var(--bs-primary);
- --bs-popover-header-bg: var(--bs-primary);
+ --bs-popover-border-color: var(--bs-primary-border);
+ --bs-popover-header-bg: var(--bs-primary-bg);
--bs-popover-header-color: var(--bs-white);
--bs-popover-body-padding-x: 1rem;
--bs-popover-body-padding-y: 0.5rem;
}
.custom-tooltip {
- --bs-tooltip-bg: var(--bs-primary);
+ --bs-tooltip-bg: var(--bs-primary-bg);
}
/* override parts of the Bootstrap color scheme */
:root {
- --bs-code-color: var(--bs-secondary-color);
+ --bs-code-color: var(--bs-secondary-contrast);
}
.navbar {