diff --git a/.github/dita-ot/footer.xml b/.github/dita-ot/footer.xml index 5a20a473..6d883d25 100644 --- a/.github/dita-ot/footer.xml +++ b/.github/dita-ot/footer.xml @@ -34,7 +34,7 @@

- © 2017–2023 + © 2017–2024 infotexture

diff --git a/.github/dita-ot/header.xml b/.github/dita-ot/header.xml index b32b6715..df5c4849 100644 --- a/.github/dita-ot/header.xml +++ b/.github/dita-ot/header.xml @@ -88,15 +88,17 @@ /> + + + diff --git a/.github/dita-ot/html.xml b/.github/dita-ot/html.xml index 0b876582..d4590a94 100644 --- a/.github/dita-ot/html.xml +++ b/.github/dita-ot/html.xml @@ -27,14 +27,11 @@ + - diff --git a/.github/dita-ot/theme.css b/.github/dita-ot/theme.css index 14938515..01031927 100644 --- a/.github/dita-ot/theme.css +++ b/.github/dita-ot/theme.css @@ -33,3 +33,14 @@ :root { --bs-code-color: var(--bs-secondary-color); } + +/* Make all CSS themes scrollable */ +.css-themes-list { + height: calc(100vh - 6rem); +} + +@media (max-width: 991.98px) { + .css-themes-list { + height: calc(100vh - 25rem); + } +} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dec2b0f3..f6b76e38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Calculate short SHA uses: benjlevesque/short-sha@v2.2 @@ -37,18 +37,19 @@ jobs: plugins: | fox.jason.extend.css https://github.com/infotexture/dita-bootstrap/archive/develop.zip - https://github.com/infotexture/dita-bootstrap.lunr/archive/develop.zip - https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip + net.infotexture.dita-bootstrap.lunr + fox.jason.prismjs fox.jason.favicon - https://github.com/jason-fox/fox.jason.open-graph/archive/master.zip + fox.jason.open-graph + https://github.com/jason-fox/fox.jason.theme-switcher/archive/master.zip project: .github/dita-ot/html.xml - name: Deploy HTML 🚀 - uses: JamesIves/github-pages-deploy-action@v4.4.3 + uses: JamesIves/github-pages-deploy-action@v4.5.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 infotexture/dita-bootstrap@${{ env.SHA }} to GitHub Pages' + commit-message: '🚀 Deploy ${{ env.SHA }} to GitHub Pages' git-config-name: 'GitHub Action' git-config-email: 'action@github.com' diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 4fc499c4..2f90d6b2 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -17,13 +17,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: # Make sure the actual branch is checked out when running on pull requests ref: ${{ github.ref }} - name: Set up Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '18.x' cache: 'npm' diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index cbb62f6d..00000000 --- a/.prettierrc.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "arrowParens": "avoid", - "bracketSpacing": false, - "endOfLine": "lf", - "htmlWhitespaceSensitivity": "css", - "printWidth": 120, - "proseWrap": "preserve", - "requirePragma": false, - "semi": true, - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "all", - "useTabs": false, - "vueIndentScriptAndStyle": true, - "xmlSelfClosingSpace": false, - "xmlWhitespaceSensitivity": "strict", - "overrides": [ - { - "files": "*.json", - "options": { - "printWidth": 200 - } - }, - { - "files": "*.xml", - "options": { - "printWidth": 80 - } - }, - { - "files": "strings-*.xml", - "options": { - "printWidth": 100 - } - }, - { - "files": "*.xsl", - "options": { - "parser": "xml" - } - } - ], - "plugins": ["@prettier/plugin-xml"] -} diff --git a/.prettierrc.yml b/.prettierrc.yml new file mode 100644 index 00000000..ed8ced37 --- /dev/null +++ b/.prettierrc.yml @@ -0,0 +1,37 @@ +# Prettier Configuration File + +# https://prettier.io/docs/en/configuration.html + +arrowParens: avoid +bracketSpacing: false +endOfLine: lf +htmlWhitespaceSensitivity: css +printWidth: 120 +proseWrap: preserve +requirePragma: false +semi: true +singleQuote: true +tabWidth: 2 +trailingComma: all +useTabs: false +vueIndentScriptAndStyle: true +xmlSelfClosingSpace: false +xmlWhitespaceSensitivity: strict + +# Override configuration for certain files +overrides: + - files: '*.json' + options: + printWidth: 200 + - files: '*.xml' + options: + printWidth: 80 + - files: strings-*.xml + options: + printWidth: 100 + - files: '*.xsl' + options: + parser: xml + +plugins: + - '@prettier/plugin-xml' diff --git a/Customization/xsl/card.xsl b/Customization/xsl/card.xsl index 7c6b4bc9..da4c1474 100644 --- a/Customization/xsl/card.xsl +++ b/Customization/xsl/card.xsl @@ -19,18 +19,18 @@
diff --git a/Customization/xsl/carousel.xsl b/Customization/xsl/carousel.xsl index d4fdda27..287baa43 100644 --- a/Customization/xsl/carousel.xsl +++ b/Customization/xsl/carousel.xsl @@ -16,6 +16,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,52 +84,16 @@ - + + + - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/Customization/xsl/nav.xsl b/Customization/xsl/nav.xsl index 2e8b8e31..ba6440af 100644 --- a/Customization/xsl/nav.xsl +++ b/Customization/xsl/nav.xsl @@ -172,14 +172,16 @@ -
- +
+
+ +
@@ -710,7 +712,11 @@ priority="10" > - + diff --git a/Customization/xsl/topic.xsl b/Customization/xsl/topic.xsl index 395a3799..0fbe81c5 100644 --- a/Customization/xsl/topic.xsl +++ b/Customization/xsl/topic.xsl @@ -14,6 +14,29 @@ + + + + + + + + + + + + + + file:// + + + file:/ + + + + + + @@ -47,19 +70,56 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
- - - + + +
+ + + sticky-top + + bg-body-tertiary + + + + +
+
@@ -141,6 +201,7 @@
+ @@ -177,6 +238,12 @@ + + + + + + @@ -226,7 +293,7 @@ @@ -438,33 +505,102 @@ - + -
  • - - - - - - - - - - - - - - - - - - - -
  • +
  • + + + + + + + + + + + + + + + + + + + +
  • +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + imageleft + imageright + imagecenter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Customization/xsl/utility-classes.xsl b/Customization/xsl/utility-classes.xsl index e24bbd9a..c67de76b 100644 --- a/Customization/xsl/utility-classes.xsl +++ b/Customization/xsl/utility-classes.xsl @@ -86,8 +86,19 @@ match="*[contains(@class, ' topic/section ')]/*[contains(@class, ' topic/title ')]" mode="get-output-class" > - - + + + + + + + + + + + + +
    @@ -185,6 +196,13 @@ + + + + + + + @@ -379,7 +397,11 @@ - + + + + + @@ -391,6 +413,12 @@ + + + diff --git a/README.md b/README.md index db7dd09e..76830099 100644 --- a/README.md +++ b/README.md @@ -233,7 +233,7 @@ Additionally, opt-in breadcrumbs and menu bars and other modifiers can be added ## License -[Apache 2.0](LICENSE) © 2017–2023 Roger W. Fienhold Sheen +[Apache 2.0](LICENSE) © 2017–2024 Roger W. Fienhold Sheen The generated HTML created by this software includes the following additional software components which are obtained under license: diff --git a/build_dita2html5-bootstrap_template.xml b/build_dita2html5-bootstrap_template.xml index 519f5a00..e1c25238 100644 --- a/build_dita2html5-bootstrap_template.xml +++ b/build_dita2html5-bootstrap_template.xml @@ -174,6 +174,11 @@ property="bootstrap.sidebar.ftr.path" file="${bootstrap.sidebar.ftr}" /> + diff --git a/css/common-bootstrap.css b/css/common-bootstrap.css index 73fc53a3..9c3801ff 100644 --- a/css/common-bootstrap.css +++ b/css/common-bootstrap.css @@ -103,10 +103,6 @@ overflow: auto; } -.bs-header { - z-index: 1020; -} - .search-box [type='search']::placeholder { color: var(--bs-link-color) !important; } diff --git a/css/side-toc.css b/css/side-toc.css index 027b20a7..e4f372a6 100644 --- a/css/side-toc.css +++ b/css/side-toc.css @@ -27,11 +27,6 @@ min-width: 1px; } -.bs-header { - position: sticky; - top: 0; -} - .bs-fixed-sidetoc { height: calc(100vh - 10rem); } @@ -42,7 +37,6 @@ @media (max-width: 991.98px) { .bs-main { - max-width: 760px; margin-inline: auto; } .bs-fixed-sidetoc { diff --git a/includes/bootstrap.icons.hdf.xml b/includes/bootstrap.icons.hdf.xml index b752a36d..6aac01f1 100644 --- a/includes/bootstrap.icons.hdf.xml +++ b/includes/bootstrap.icons.hdf.xml @@ -1,6 +1,6 @@ diff --git a/includes/dark-mode-toggler.js b/includes/dark-mode-toggler.js index 9d1f5c76..52d7489e 100644 --- a/includes/dark-mode-toggler.js +++ b/includes/dark-mode-toggler.js @@ -30,7 +30,7 @@ setTheme(getPreferredTheme()); const showActiveTheme = (theme, focus = false) => { - const themeSwitcher = document.querySelector('#bd-theme'); + const themeSwitcher = document.querySelector('#bd-color-mode'); if (!themeSwitcher) { return; diff --git a/includes/ftr.content.example.xml b/includes/ftr.content.example.xml index 15f47db6..de5b7744 100644 --- a/includes/ftr.content.example.xml +++ b/includes/ftr.content.example.xml @@ -138,7 +138,7 @@ commodi optio pariatur est quia magnam eum harum corrupti dicta, aliquam sequi voluptate quas.

    - © 2023 + © 2024

    diff --git a/includes/hdr.navbar.default.xml b/includes/hdr.navbar.default.xml index 58933c04..fc1e3485 100644 --- a/includes/hdr.navbar.default.xml +++ b/includes/hdr.navbar.default.xml @@ -63,7 +63,7 @@