-
-
-
-
+
diff --git a/.github/dita-ot/html.xml b/.github/dita-ot/html.xml
index 8bafb2eb..3668ad3d 100644
--- a/.github/dita-ot/html.xml
+++ b/.github/dita-ot/html.xml
@@ -27,7 +27,8 @@
-
+
+
diff --git a/.github/dita-ot/theme.css b/.github/dita-ot/theme.css
index 01031927..0b2cfd68 100644
--- a/.github/dita-ot/theme.css
+++ b/.github/dita-ot/theme.css
@@ -18,20 +18,44 @@
.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 part of the Bootstrap color scheme */
+/* override parts of the Bootstrap color scheme */
:root {
- --bs-code-color: var(--bs-secondary-color);
+ --bs-code-color: var(--bs-secondary-contrast);
+}
+
+.navbar {
+ --bs-navbar-brand-hover-color: var(--bs-primary-contrast);
+ --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;
+ --bs-navbar-toggler-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='black' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
+}
+
+.nav-link {
+ --bs-nav-link-hover-color: var(--bs-primary-contrast);
+}
+
+.navbar-toggler {
+ color: var(--bs-navbar-color);
+ background-color: transparent;
+ border-color: rgba(255, 255, 255, 0.15);
+ transition: background-color 0.15s ease-in-out;
+}
+
+.navbar-toggler:hover {
+ background-color: rgba(255, 255, 255, 0.1);
}
/* Make all CSS themes scrollable */
@@ -39,7 +63,7 @@
height: calc(100vh - 6rem);
}
-@media (max-width: 991.98px) {
+@media (max-width: 1023.98px) {
.css-themes-list {
height: calc(100vh - 25rem);
}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 59ba2695..3ad5b908 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:
@@ -26,6 +28,43 @@ jobs:
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,22 +73,29 @@ jobs:
export DEBIAN_FRONTEND=noninteractive
apt-get install -qy --no-install-recommends nodejs
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/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
+ # 3. Determine target folder 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
+
+ # 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.
- commit-message: '🚀 Deploy ${{ env.SHA }} to GitHub Pages'
+ 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'
- git-config-email: 'action@github.com'
+ clean-exclude: |
+ v5
+ v6
diff --git a/.gitignore b/.gitignore
index e640b74e..80ec90ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,4 +71,5 @@ xsl/dita2html5-bootstrapImpl.xsl
xsl/dita2html5-legacy-3.0.xsl
node_modules
-out
\ No newline at end of file
+out
+.gstack/
diff --git a/Customization/xsl/accordion.xsl b/Customization/xsl/accordion.xsl
index 1bbe66a7..cccde048 100644
--- a/Customization/xsl/accordion.xsl
+++ b/Customization/xsl/accordion.xsl
@@ -15,7 +15,7 @@
@@ -24,75 +24,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
- h6
- h
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ select="*[not(contains(@class, ' topic/title '))] | text() | comment() | processing-instruction()"
+ />
-
-
+
+
+
-
+