Skip to content

Commit ee9ca41

Browse files
committed
Merge branch 'release/5.3.1'
* release/5.3.1: (79 commits) Update remaining references to collapsible ToC Bump plug-in version to 5.3.1 Edit README to fix minor formatting issues Fix icons header file reference Switch nav-toc to collapsible for CI builds Formatting Bump icons to 1.8.1 © Update footer copyright ranges Run Prettier in CI check Bump devDependencies Reformat Fix indentation Reformat Re-run Prettier More frame options: Additional table frame support Update CSS, improve accessibility Amend padding Add collapse support Correct text. ...
2 parents 34f1338 + 8a642ec commit ee9ca41

File tree

135 files changed

+4704
-304
lines changed

Some content is hidden

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

135 files changed

+4704
-304
lines changed

.github/dita-ot/favicon.svg

Lines changed: 15 additions & 0 deletions
Loading

.github/dita-ot/footer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</p>
2929
<p class="p-3">
3030
<small>
31-
© 2021
31+
© 2017–2022
3232
<a class="text-dark" href="https://infotexture.net/">infotexture</a>
3333
</small>
3434
</p>

.github/dita-ot/header.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<nav class="navbar navbar-expand-lg navbar-dark bg-primary mb-4">
1+
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
22

33
<div class="container">
44
<a class="navbar-brand" href="https://infotexture.github.io/dita-bootstrap">
@@ -53,7 +53,7 @@
5353
<li class="nav-item">
5454
<a
5555
class="nav-link"
56-
href="https://getbootstrap.com/docs/5.0"
56+
href="https://getbootstrap.com/docs/5.1"
5757
>Bootstrap Docs</a>
5858
</li>
5959
</ul>

.github/dita-ot/html.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@
1515
<param name="args.css" value="theme.css"/>
1616
<param name="args.csspath" value="css"/>
1717
<param name="args.cssroot" path="."/>
18+
<param name="args.favicon" value="favicon.svg"/>
19+
<param name="args.faviconpath" value="favicon"/>
20+
<param name="args.faviconroot" path="."/>
1821
<param name="args.hdr" href="header.xml"/>
1922
<param name="args.ftr" href="footer.xml"/>
2023
<param name="html5.toc.generate" value="no"/>
2124
<param name="args.rellinks" value="none"/>
22-
<param name="nav-toc" value="list-group-full"/>
25+
<param name="nav-toc" value="collapsible"/>
2326
<param name="processing-mode" value="strict"/>
2427
<param name="icons.include" value="yes"/>
28+
<param name="popovers.include" value="yes"/>
2529
</publication>
2630
</deliverable>
2731
</project>

.github/dita-ot/theme.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77

88
/* ↓ Additional custom overrides ↓ */
99

10-
.list-group-item-dark {
11-
background-color: #e7f1ff;
12-
}
13-
1410
footer {
1511
background-color: #e7f1ff;
1612
border-top: 1px solid rgba(0, 0, 0, 0.125);

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ jobs:
2121
apt-get install -qy --no-install-recommends nodejs
2222
nodejs -v
2323
plugins: |
24-
https://github.com/jason-fox/fox.jason.extend.css/archive/master.zip
24+
fox.jason.extend.css
2525
https://github.com/infotexture/dita-bootstrap/archive/develop.zip
26-
https://github.com/jason-fox/fox.jason.prismjs/archive/master.zip
26+
fox.jason.prismjs
27+
fox.jason.favicon
2728
project: .github/dita-ot/html.xml
2829
- name: Deploy HTML 🚀
2930
uses: JamesIves/github-pages-deploy-action@3.7.1

.github/workflows/prettier.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# This workflow checks code formatting
2+
3+
name: Run Prettier
4+
5+
# This action works with pull requests and pushes
6+
7+
on:
8+
pull_request:
9+
push:
10+
branches:
11+
# Push events on development branch
12+
- develop
13+
14+
jobs:
15+
prettier:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
with:
22+
# Make sure the actual branch is checked out when running on pull requests
23+
ref: ${{ github.ref }}
24+
25+
- name: Prettify code
26+
uses: creyD/prettier_action@v3.3
27+
with:
28+
# This part is also where you can pass other options, for example:
29+
prettier_options: --write **/*.{css,dita*,json,md,xml,yml}
30+
# Install Prettier XML plugin
31+
prettier_plugins: '@prettier/plugin-xml'
32+
# Runs the action in dry mode. Files wont get changed and the action fails if there are unprettified files.
33+
dry: true

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# This file specifies files that Prettier should not format
22

33
backups
4+
cfg/common/vars/strings.xml
45
out

.prettierrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
"printWidth": 80
2828
}
2929
},
30+
{
31+
"files": "strings-*.xml",
32+
"options": {
33+
"printWidth": 100
34+
}
35+
},
3036
{
3137
"files": "*.xsl",
3238
"options": {

Customization/xsl/accordion.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
exclude-result-prefixes="xs xhtml dita-ot"
1313
>
1414
<!-- Customization to add Bootstrap Accordion Component -->
15-
<!-- https://getbootstrap.com/docs/5.0/components/accordion/ -->
15+
<!-- https://getbootstrap.com/docs/5.1/components/accordion/ -->
1616

1717
<xsl:template match="*[contains(@class,' topic/bodydiv ') and contains(@outputclass, 'accordion')]">
1818
<div>

0 commit comments

Comments
 (0)