Skip to content

Commit 6a3c640

Browse files
infotextureinfotexture
committed
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 ...
2 parents 2bffbef + 399782a commit 6a3c640

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2179
-1917
lines changed

‎.github/dita-ot/footer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</p>
3535
<p>
3636
<small>
37-
© 2017–2023
37+
© 2017–2024
3838
<a href="https://infotexture.net/">infotexture</a>
3939
</small>
4040
</p>

‎.github/dita-ot/header.xml

Lines changed: 261 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,17 @@
8888
/>
8989
</form>
9090
</li>
91+
</ul>
92+
<ul class="navbar-nav ms-0 me-1">
9193
<!--
92-
This is a dark/light color theme toggler
94+
This is a dark/light color theme toggler.
9395
It requires JavaScript to function.
9496
-->
9597
<li class="nav-item dropdown">
9698
<a
9799
href="#"
98100
class="nav-link px-0 px-lg-2 dropdown-toggle d-flex align-items-center"
99-
id="bd-theme"
101+
id="bd-color-mode"
100102
data-bs-toggle="dropdown"
101103
aria-expanded="false"
102104
data-bs-display="static"
@@ -110,11 +112,11 @@
110112
<span class="d-auto">
111113
<i class="bi bi-circle-half"/>
112114
</span>
113-
<span class="d-lg-none ms-2">Toggle theme</span>
115+
<span class="d-lg-none ms-2">Color mode</span>
114116
</a>
115117
<ul
116118
class="dropdown-menu dropdown-menu-end"
117-
aria-labelledby="bd-theme"
119+
aria-labelledby="bd-color-mode"
118120
style="--bs-dropdown-min-width: 6rem;"
119121
data-bs-popper="static"
120122
>
@@ -151,6 +153,261 @@
151153
</ul>
152154
</li>
153155
</ul>
156+
<ul class="navbar-nav ms-0 me-1">
157+
<!--
158+
This is a css bootstrap theme toggler.
159+
It requires JavaScript to function.
160+
-->
161+
<li class="nav-item dropdown">
162+
<a
163+
href="#"
164+
class="nav-link px-0 px-lg-2 dropdown-toggle d-flex align-items-center"
165+
id="bd-css-theme"
166+
data-bs-toggle="dropdown"
167+
aria-expanded="false"
168+
data-bs-display="static"
169+
>
170+
<i class="bi bi-filetype-css"/>
171+
<span class="d-lg-none ms-2">Toggle theme</span>
172+
</a>
173+
<ul
174+
class="dropdown-menu dropdown-menu-end css-themes-list overflow-y-auto"
175+
aria-labelledby="bd-css-theme"
176+
style="--bs-dropdown-min-width: 6rem;"
177+
data-bs-popper="static"
178+
>
179+
<li>
180+
<button
181+
type="button"
182+
class="dropdown-item d-flex align-items-center"
183+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
184+
>
185+
Default
186+
</button>
187+
</li>
188+
<li>
189+
<hr class="dropdown-divider"/>
190+
</li>
191+
<li>
192+
<button
193+
type="button"
194+
class="dropdown-item d-flex align-items-center"
195+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/cerulean/bootstrap.min.css"
196+
>
197+
Cerulean
198+
</button>
199+
</li>
200+
<li>
201+
<button
202+
type="button"
203+
class="dropdown-item d-flex align-items-center"
204+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/cyborg/bootstrap.min.css"
205+
>
206+
Cyborg
207+
</button>
208+
</li>
209+
<li>
210+
<button
211+
type="button"
212+
class="dropdown-item d-flex align-items-center"
213+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/darkly/bootstrap.min.css"
214+
>
215+
Darkly
216+
</button>
217+
</li>
218+
<li>
219+
<button
220+
type="button"
221+
class="dropdown-item d-flex align-items-center"
222+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/flatly/bootstrap.min.css"
223+
>
224+
Flatly
225+
</button>
226+
</li>
227+
<li>
228+
<button
229+
type="button"
230+
class="dropdown-item d-flex align-items-center"
231+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/journal/bootstrap.min.css"
232+
>
233+
Journal
234+
</button>
235+
</li>
236+
<li>
237+
<button
238+
type="button"
239+
class="dropdown-item d-flex align-items-center"
240+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/litera/bootstrap.min.css"
241+
>
242+
Litera
243+
</button>
244+
</li>
245+
<li>
246+
<button
247+
type="button"
248+
class="dropdown-item d-flex align-items-center"
249+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/lumen/bootstrap.min.css"
250+
>
251+
Lumen
252+
</button>
253+
</li>
254+
<li>
255+
<button
256+
type="button"
257+
class="dropdown-item d-flex align-items-center"
258+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/lux/bootstrap.min.css"
259+
>
260+
Lux
261+
</button>
262+
</li>
263+
<li>
264+
<button
265+
type="button"
266+
class="dropdown-item d-flex align-items-center"
267+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/materia/bootstrap.min.css"
268+
>
269+
Materia
270+
</button>
271+
</li>
272+
<li>
273+
<button
274+
type="button"
275+
class="dropdown-item d-flex align-items-center"
276+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/minty/bootstrap.min.css"
277+
>
278+
Minty
279+
</button>
280+
</li>
281+
<li>
282+
<button
283+
type="button"
284+
class="dropdown-item d-flex align-items-center"
285+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/morph/bootstrap.min.css"
286+
>
287+
Morph
288+
</button>
289+
</li>
290+
291+
<li>
292+
<button
293+
type="button"
294+
class="dropdown-item d-flex align-items-center"
295+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/pulse/bootstrap.min.css"
296+
>
297+
Pulse
298+
</button>
299+
</li>
300+
<li>
301+
<button
302+
type="button"
303+
class="dropdown-item d-flex align-items-center"
304+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/quartz/bootstrap.min.css"
305+
>
306+
Quartz
307+
</button>
308+
</li>
309+
<li>
310+
<button
311+
type="button"
312+
class="dropdown-item d-flex align-items-center"
313+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/sandstone/bootstrap.min.css"
314+
>
315+
Sandstone
316+
</button>
317+
</li>
318+
<li>
319+
<button
320+
type="button"
321+
class="dropdown-item d-flex align-items-center"
322+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/simplex/bootstrap.min.css"
323+
>
324+
Simplex
325+
</button>
326+
</li>
327+
<li>
328+
<button
329+
type="button"
330+
class="dropdown-item d-flex align-items-center"
331+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/sketchy/bootstrap.min.css"
332+
>
333+
Sketchy
334+
</button>
335+
</li>
336+
<li>
337+
<button
338+
type="button"
339+
class="dropdown-item d-flex align-items-center"
340+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/slate/bootstrap.min.css"
341+
>
342+
Slate
343+
</button>
344+
</li>
345+
<li>
346+
<button
347+
type="button"
348+
class="dropdown-item d-flex align-items-center"
349+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/solar/bootstrap.min.css"
350+
>
351+
Solar
352+
</button>
353+
</li>
354+
<li>
355+
<button
356+
type="button"
357+
class="dropdown-item d-flex align-items-center"
358+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/spacelab/bootstrap.min.css"
359+
>
360+
SpaceLab
361+
</button>
362+
</li>
363+
<li>
364+
<button
365+
type="button"
366+
class="dropdown-item d-flex align-items-center"
367+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/superhero/bootstrap.min.css"
368+
>
369+
Superhero
370+
</button>
371+
</li>
372+
<li>
373+
<button
374+
type="button"
375+
class="dropdown-item d-flex align-items-center"
376+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/united/bootstrap.min.css"
377+
>
378+
United
379+
</button>
380+
</li>
381+
<li>
382+
<button
383+
type="button"
384+
class="dropdown-item d-flex align-items-center"
385+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/vapor/bootstrap.min.css"
386+
>
387+
Vapor
388+
</button>
389+
</li>
390+
<li>
391+
<button
392+
type="button"
393+
class="dropdown-item d-flex align-items-center"
394+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/yeti/bootstrap.min.css"
395+
>
396+
Yeti
397+
</button>
398+
</li>
399+
<li>
400+
<button
401+
type="button"
402+
class="dropdown-item d-flex align-items-center"
403+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/zephyr/bootstrap.min.css"
404+
>
405+
Zephyr
406+
</button>
407+
</li>
408+
</ul>
409+
</li>
410+
</ul>
154411
</div>
155412
</div>
156413
</nav>

‎.github/dita-ot/html.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@
2727
<param name="icons.include" value="yes"/>
2828
<param name="popovers.include" value="yes"/>
2929
<param name="dark.mode.include" value="yes"/>
30+
<param name="css.theme.switcher" value="yes"/>
3031
<param
3132
name="open-graph.url"
3233
value="https://infotexture.github.io/dita-bootstrap"
3334
/>
34-
<param
35-
name="lunr.search"
36-
value="https://infotexture.github.io/dita-bootstrap"
37-
/>
3835
<param name="twitter.site" value="@infotexture"/>
3936
</publication>
4037
</deliverable>

‎.github/dita-ot/theme.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,14 @@
3333
:root {
3434
--bs-code-color: var(--bs-secondary-color);
3535
}
36+
37+
/* Make all CSS themes scrollable */
38+
.css-themes-list {
39+
height: calc(100vh - 6rem);
40+
}
41+
42+
@media (max-width: 991.98px) {
43+
.css-themes-list {
44+
height: calc(100vh - 25rem);
45+
}
46+
}

‎.github/workflows/ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Git checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: Calculate short SHA
1818
uses: benjlevesque/short-sha@v2.2
@@ -37,18 +37,19 @@ jobs:
3737
plugins: |
3838
fox.jason.extend.css
3939
https://github.com/infotexture/dita-bootstrap/archive/develop.zip
40-
https://github.com/infotexture/dita-bootstrap.lunr/archive/develop.zip
41-
https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip
40+
net.infotexture.dita-bootstrap.lunr
41+
fox.jason.prismjs
4242
fox.jason.favicon
43-
https://github.com/jason-fox/fox.jason.open-graph/archive/master.zip
43+
fox.jason.open-graph
44+
https://github.com/jason-fox/fox.jason.theme-switcher/archive/master.zip
4445
project: .github/dita-ot/html.xml
4546

4647
- name: Deploy HTML 🚀
47-
uses: JamesIves/github-pages-deploy-action@v4.4.3
48+
uses: JamesIves/github-pages-deploy-action@v4.5.0
4849
with:
4950
token: ${{ secrets.GITHUB_TOKEN }}
5051
branch: gh-pages # The branch the action should deploy to.
5152
folder: out/html # The folder the action should deploy.
52-
commit-message: '🚀 Deploy infotexture/dita-bootstrap@${{ env.SHA }} to GitHub Pages'
53+
commit-message: '🚀 Deploy ${{ env.SHA }} to GitHub Pages'
5354
git-config-name: 'GitHub Action'
5455
git-config-email: 'action@github.com'

‎.github/workflows/prettier.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
# Make sure the actual branch is checked out when running on pull requests
2323
ref: ${{ github.ref }}
2424

2525
- name: Set up Node.js
26-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2727
with:
2828
node-version: '18.x'
2929
cache: 'npm'

0 commit comments

Comments
 (0)