Skip to content

Commit

Permalink
Merge branch 'release/5.3.4'
Browse files Browse the repository at this point in the history
* 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
  ...
  • Loading branch information
infotexture committed Feb 7, 2024
2 parents 2bffbef + 399782a commit 6a3c640
Show file tree
Hide file tree
Showing 57 changed files with 2,179 additions and 1,917 deletions.
2 changes: 1 addition & 1 deletion .github/dita-ot/footer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</p>
<p>
<small>
© 2017–2023
© 2017–2024
<a href="https://infotexture.net/">infotexture</a>
</small>
</p>
Expand Down
265 changes: 261 additions & 4 deletions .github/dita-ot/header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
>
Expand Down Expand Up @@ -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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/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/[email protected]/dist/zephyr/bootstrap.min.css"
>
Zephyr
</button>
</li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
5 changes: 1 addition & 4 deletions .github/dita-ot/html.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions .github/dita-ot/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand All @@ -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: '[email protected]'
4 changes: 2 additions & 2 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading

0 comments on commit 6a3c640

Please sign in to comment.