Merge branch 'release/5.3.4'

* release/5.3.4: (64 commits) Bump plug-in version attribute to 5.3.4 Migrate Husky to v9 Bump husky from 8.0.3 to 9.0.10 (#176) Bump stylelint from 16.1.0 to 16.2.1 (#175) Bump lint-staged from 15.2.0 to 15.2.2 (#174) Bump bootstrap-icons version in header file Bump bootstrap-icons from 1.11.2 to 1.11.3 Bump prettier from 3.1.1 to 3.2.4 (#168) Use `depend.preprocess.post` endpoint (#173) Update copyright year Fix #166 - Extend menubar-toc background to viewport width (#167) Switch card headers from `<sectiondiv>` to `<div>` (#163) Whitespacing Simplify media attribute Increase contrast between various images. Amend whitespace. Additional image support for mobile devices. Update nav.xsl to fix collapsible ToC (#162) Fix #89 - Remove side ToC max-width (#161) Align license comments ...
infotexture · Feb 7, 2024 · 6a3c640 · 6a3c640
2 parents 2bffbef + 399782a
commit 6a3c640
Show file tree

Hide file tree

Showing 57 changed files with 2,179 additions and 1,917 deletions.
diff --git a/.github/dita-ot/footer.xml b/.github/dita-ot/footer.xml
@@ -34,7 +34,7 @@
       </p>
       <p>
         <small>
-          © 2017–2023
+          © 2017–2024
           <a href="https://infotexture.net/">infotexture</a>
         </small>
       </p>

diff --git a/.github/dita-ot/header.xml b/.github/dita-ot/header.xml
@@ -88,15 +88,17 @@
             />
           </form>
         </li>
+      </ul>
+      <ul class="navbar-nav ms-0 me-1">
         <!--
-          This is a dark/light color theme toggler
+          This is a dark/light color theme toggler.
           It requires JavaScript to function.
         -->
         <li class="nav-item dropdown">
           <a
             href="#"
             class="nav-link px-0 px-lg-2 dropdown-toggle d-flex align-items-center"
-            id="bd-theme"
+            id="bd-color-mode"
             data-bs-toggle="dropdown"
             aria-expanded="false"
             data-bs-display="static"
@@ -110,11 +112,11 @@
             <span class="d-auto">
               <i class="bi bi-circle-half"/>
             </span>
-            <span class="d-lg-none ms-2">Toggle theme</span>
+            <span class="d-lg-none ms-2">Color mode</span>
           </a>
           <ul
             class="dropdown-menu dropdown-menu-end"
-            aria-labelledby="bd-theme"
+            aria-labelledby="bd-color-mode"
             style="--bs-dropdown-min-width: 6rem;"
             data-bs-popper="static"
           >
@@ -151,6 +153,261 @@
           </ul>
         </li>
       </ul>
+      <ul class="navbar-nav ms-0 me-1">
+        <!--
+          This is a css bootstrap theme toggler.
+          It requires JavaScript to function.
+        -->
+        <li class="nav-item dropdown">
+          <a
+            href="#"
+            class="nav-link px-0 px-lg-2 dropdown-toggle d-flex align-items-center"
+            id="bd-css-theme"
+            data-bs-toggle="dropdown"
+            aria-expanded="false"
+            data-bs-display="static"
+          >
+            <i class="bi bi-filetype-css"/>
+            <span class="d-lg-none ms-2">Toggle theme</span>
+          </a>
+          <ul
+            class="dropdown-menu dropdown-menu-end css-themes-list overflow-y-auto"
+            aria-labelledby="bd-css-theme"
+            style="--bs-dropdown-min-width: 6rem;"
+            data-bs-popper="static"
+          >
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
+              >
+                Default
+              </button>
+            </li>
+            <li>
+              <hr class="dropdown-divider"/>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/cerulean/bootstrap.min.css"
+              >
+                Cerulean
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/cyborg/bootstrap.min.css"
+              >
+                Cyborg
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/darkly/bootstrap.min.css"
+              >
+                Darkly
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/flatly/bootstrap.min.css"
+              >
+                Flatly
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/journal/bootstrap.min.css"
+              >
+                Journal
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/litera/bootstrap.min.css"
+              >
+                Litera
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/lumen/bootstrap.min.css"
+              >
+                Lumen
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/lux/bootstrap.min.css"
+              >
+                Lux
+              </button>
+            </li>
+          <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/materia/bootstrap.min.css"
+              >
+                Materia
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/minty/bootstrap.min.css"
+              >
+                Minty
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/morph/bootstrap.min.css"
+              >
+                Morph
+              </button>
+            </li>
+
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/pulse/bootstrap.min.css"
+              >
+                Pulse
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/quartz/bootstrap.min.css"
+              >
+                Quartz
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/sandstone/bootstrap.min.css"
+              >
+                Sandstone
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/simplex/bootstrap.min.css"
+              >
+                Simplex
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/sketchy/bootstrap.min.css"
+              >
+                Sketchy
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/slate/bootstrap.min.css"
+              >
+                Slate
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/solar/bootstrap.min.css"
+              >
+                Solar
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/spacelab/bootstrap.min.css"
+              >
+                SpaceLab
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/superhero/bootstrap.min.css"
+              >
+                Superhero
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/united/bootstrap.min.css"
+              >
+                United
+              </button>
+            </li>
+          <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/vapor/bootstrap.min.css"
+              >
+                Vapor
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/yeti/bootstrap.min.css"
+              >
+                Yeti
+              </button>
+            </li>
+            <li>
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center"
+                data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/zephyr/bootstrap.min.css"
+              >
+                Zephyr
+              </button>
+            </li>
+          </ul>
+        </li>
+      </ul>
     </div>
   </div>
 </nav>
diff --git a/.github/dita-ot/html.xml b/.github/dita-ot/html.xml
@@ -27,14 +27,11 @@
       <param name="icons.include" value="yes"/>
       <param name="popovers.include" value="yes"/>
       <param name="dark.mode.include" value="yes"/>
+      <param name="css.theme.switcher" value="yes"/>
       <param
         name="open-graph.url"
         value="https://infotexture.github.io/dita-bootstrap"
       />
-      <param
-        name="lunr.search"
-        value="https://infotexture.github.io/dita-bootstrap"
-      />
       <param name="twitter.site" value="@infotexture"/>
     </publication>
   </deliverable>

diff --git 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
@@ -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
@@ -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'