Skip to content

Commit e8593e5

Browse files
jason-foxjason-fox
authored
Merge branch 'release/5.3.6'
- Update Bootstrap & icons dependencies for 5.3.6 (#248)
2 parents 80e1fea + 76067f4 commit e8593e5

File tree

8 files changed

+60
-57
lines changed

8 files changed

+60
-57
lines changed

‎.github/dita-ot/header.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<button
182182
type="button"
183183
class="dropdown-item d-flex align-items-center"
184-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/css/bootstrap.min.css"
184+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.6/dist/css/bootstrap.min.css"
185185
>
186186
Default
187187
</button>
@@ -193,7 +193,7 @@
193193
<button
194194
type="button"
195195
class="dropdown-item d-flex align-items-center"
196-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/cerulean/bootstrap.min.css"
196+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/cerulean/bootstrap.min.css"
197197
>
198198
Cerulean
199199
</button>
@@ -202,7 +202,7 @@
202202
<button
203203
type="button"
204204
class="dropdown-item d-flex align-items-center"
205-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/cosmo/bootstrap.min.css"
205+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/cosmo/bootstrap.min.css"
206206
>
207207
Cosmo
208208
</button>
@@ -211,7 +211,7 @@
211211
<button
212212
type="button"
213213
class="dropdown-item d-flex align-items-center"
214-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/cyborg/bootstrap.min.css"
214+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/cyborg/bootstrap.min.css"
215215
>
216216
Cyborg
217217
</button>
@@ -220,7 +220,7 @@
220220
<button
221221
type="button"
222222
class="dropdown-item d-flex align-items-center"
223-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/darkly/bootstrap.min.css"
223+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/darkly/bootstrap.min.css"
224224
>
225225
Darkly
226226
</button>
@@ -229,7 +229,7 @@
229229
<button
230230
type="button"
231231
class="dropdown-item d-flex align-items-center"
232-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/flatly/bootstrap.min.css"
232+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/flatly/bootstrap.min.css"
233233
>
234234
Flatly
235235
</button>
@@ -238,7 +238,7 @@
238238
<button
239239
type="button"
240240
class="dropdown-item d-flex align-items-center"
241-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/journal/bootstrap.min.css"
241+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/journal/bootstrap.min.css"
242242
>
243243
Journal
244244
</button>
@@ -247,7 +247,7 @@
247247
<button
248248
type="button"
249249
class="dropdown-item d-flex align-items-center"
250-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/litera/bootstrap.min.css"
250+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/litera/bootstrap.min.css"
251251
>
252252
Litera
253253
</button>
@@ -256,7 +256,7 @@
256256
<button
257257
type="button"
258258
class="dropdown-item d-flex align-items-center"
259-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/lumen/bootstrap.min.css"
259+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/lumen/bootstrap.min.css"
260260
>
261261
Lumen
262262
</button>
@@ -265,7 +265,7 @@
265265
<button
266266
type="button"
267267
class="dropdown-item d-flex align-items-center"
268-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/lux/bootstrap.min.css"
268+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/lux/bootstrap.min.css"
269269
>
270270
Lux
271271
</button>
@@ -274,7 +274,7 @@
274274
<button
275275
type="button"
276276
class="dropdown-item d-flex align-items-center"
277-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/materia/bootstrap.min.css"
277+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/materia/bootstrap.min.css"
278278
>
279279
Materia
280280
</button>
@@ -283,7 +283,7 @@
283283
<button
284284
type="button"
285285
class="dropdown-item d-flex align-items-center"
286-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/minty/bootstrap.min.css"
286+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/minty/bootstrap.min.css"
287287
>
288288
Minty
289289
</button>
@@ -292,7 +292,7 @@
292292
<button
293293
type="button"
294294
class="dropdown-item d-flex align-items-center"
295-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/morph/bootstrap.min.css"
295+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/morph/bootstrap.min.css"
296296
>
297297
Morph
298298
</button>
@@ -302,7 +302,7 @@
302302
<button
303303
type="button"
304304
class="dropdown-item d-flex align-items-center"
305-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/pulse/bootstrap.min.css"
305+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/pulse/bootstrap.min.css"
306306
>
307307
Pulse
308308
</button>
@@ -311,7 +311,7 @@
311311
<button
312312
type="button"
313313
class="dropdown-item d-flex align-items-center"
314-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/quartz/bootstrap.min.css"
314+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/quartz/bootstrap.min.css"
315315
>
316316
Quartz
317317
</button>
@@ -320,7 +320,7 @@
320320
<button
321321
type="button"
322322
class="dropdown-item d-flex align-items-center"
323-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/sandstone/bootstrap.min.css"
323+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/sandstone/bootstrap.min.css"
324324
>
325325
Sandstone
326326
</button>
@@ -329,7 +329,7 @@
329329
<button
330330
type="button"
331331
class="dropdown-item d-flex align-items-center"
332-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/simplex/bootstrap.min.css"
332+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/simplex/bootstrap.min.css"
333333
>
334334
Simplex
335335
</button>
@@ -338,7 +338,7 @@
338338
<button
339339
type="button"
340340
class="dropdown-item d-flex align-items-center"
341-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/sketchy/bootstrap.min.css"
341+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/sketchy/bootstrap.min.css"
342342
>
343343
Sketchy
344344
</button>
@@ -347,7 +347,7 @@
347347
<button
348348
type="button"
349349
class="dropdown-item d-flex align-items-center"
350-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/slate/bootstrap.min.css"
350+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/slate/bootstrap.min.css"
351351
>
352352
Slate
353353
</button>
@@ -356,7 +356,7 @@
356356
<button
357357
type="button"
358358
class="dropdown-item d-flex align-items-center"
359-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/solar/bootstrap.min.css"
359+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/solar/bootstrap.min.css"
360360
>
361361
Solar
362362
</button>
@@ -365,7 +365,7 @@
365365
<button
366366
type="button"
367367
class="dropdown-item d-flex align-items-center"
368-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/spacelab/bootstrap.min.css"
368+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/spacelab/bootstrap.min.css"
369369
>
370370
SpaceLab
371371
</button>
@@ -374,7 +374,7 @@
374374
<button
375375
type="button"
376376
class="dropdown-item d-flex align-items-center"
377-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/superhero/bootstrap.min.css"
377+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/superhero/bootstrap.min.css"
378378
>
379379
Superhero
380380
</button>
@@ -383,7 +383,7 @@
383383
<button
384384
type="button"
385385
class="dropdown-item d-flex align-items-center"
386-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/united/bootstrap.min.css"
386+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/united/bootstrap.min.css"
387387
>
388388
United
389389
</button>
@@ -392,7 +392,7 @@
392392
<button
393393
type="button"
394394
class="dropdown-item d-flex align-items-center"
395-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/vapor/bootstrap.min.css"
395+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/vapor/bootstrap.min.css"
396396
>
397397
Vapor
398398
</button>
@@ -401,7 +401,7 @@
401401
<button
402402
type="button"
403403
class="dropdown-item d-flex align-items-center"
404-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/yeti/bootstrap.min.css"
404+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/yeti/bootstrap.min.css"
405405
>
406406
Yeti
407407
</button>
@@ -410,7 +410,7 @@
410410
<button
411411
type="button"
412412
class="dropdown-item d-flex align-items-center"
413-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/zephyr/bootstrap.min.css"
413+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/zephyr/bootstrap.min.css"
414414
>
415415
Zephyr
416416
</button>

‎includes/bootstrap.hdf.rtl.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div>
22
<link
33
rel="stylesheet"
4-
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/css/bootstrap.rtl.min.css"
5-
integrity="sha384-q8+l9TmX3RaSz3HKGBmqP2u5MkgeN7HrfOJBLcTgZsQsbrx8WqqxdA5PuwUV9WIx"
4+
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.6/dist/css/bootstrap.rtl.min.css"
5+
integrity="sha384-MdqCcafa5BLgxBDJ3d/4D292geNL64JyRtSGjEszRUQX9rhL1QkcnId+OT7Yw+D+"
66
crossorigin="anonymous"
77
/>
88
<script
9-
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/js/bootstrap.bundle.min.js"
10-
integrity="sha384-k6d4wzSIapyDyv1kpU366/PK5hCdSbCRGRCMv+eplOQJWyd1fbcAu9OCUj5zNLiq"
9+
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.6/dist/js/bootstrap.bundle.min.js"
10+
integrity="sha384-j1CDi7MgGQ12Z7Qab0qlWQ/Qqz24Gc6BM0thvEMVjHnfYGF0rmFCozFSxQBxwHKO"
1111
crossorigin="anonymous"
1212
/>
1313
</div>

‎includes/bootstrap.hdf.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div>
22
<link
33
rel="stylesheet"
4-
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/css/bootstrap.min.css"
5-
integrity="sha384-SgOJa3DmI69IUzQ2PVdRZhwQ+dy64/BUtbMJw1MZ8t5HZApcHrRKUc4W0kG879m7"
4+
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.6/dist/css/bootstrap.min.css"
5+
integrity="sha384-4Q6Gf2aSP4eDXB8Miphtr37CMZZQ5oXLH2yaXMJ2w8e2ZtHTl7GptT4jmndRuHDT"
66
crossorigin="anonymous"
77
/>
88
<script
9-
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/js/bootstrap.bundle.min.js"
10-
integrity="sha384-k6d4wzSIapyDyv1kpU366/PK5hCdSbCRGRCMv+eplOQJWyd1fbcAu9OCUj5zNLiq"
9+
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.6/dist/js/bootstrap.bundle.min.js"
10+
integrity="sha384-j1CDi7MgGQ12Z7Qab0qlWQ/Qqz24Gc6BM0thvEMVjHnfYGF0rmFCozFSxQBxwHKO"
1111
crossorigin="anonymous"
1212
/>
1313
</div>

‎includes/script-only.hdf.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div>
22
<script
3-
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/js/bootstrap.bundle.min.js"
4-
integrity="sha384-k6d4wzSIapyDyv1kpU366/PK5hCdSbCRGRCMv+eplOQJWyd1fbcAu9OCUj5zNLiq"
3+
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.6/dist/js/bootstrap.bundle.min.js"
4+
integrity="sha384-j1CDi7MgGQ12Z7Qab0qlWQ/Qqz24Gc6BM0thvEMVjHnfYGF0rmFCozFSxQBxwHKO"
55
crossorigin="anonymous"
66
/>
77
</div>

‎includes/theme.hdf.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<div>
22
<link
3-
href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.5/dist/@@theme@@"
3+
href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.6/dist/@@theme@@"
44
rel="stylesheet"
55
/>
66
<script
7-
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/js/bootstrap.bundle.min.js"
8-
integrity="sha384-k6d4wzSIapyDyv1kpU366/PK5hCdSbCRGRCMv+eplOQJWyd1fbcAu9OCUj5zNLiq"
7+
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.6/dist/js/bootstrap.bundle.min.js"
8+
integrity="sha384-j1CDi7MgGQ12Z7Qab0qlWQ/Qqz24Gc6BM0thvEMVjHnfYGF0rmFCozFSxQBxwHKO"
99
crossorigin="anonymous"
1010
/>
1111
</div>

‎package-lock.json‎

Lines changed: 17 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
},
4040
"devDependencies": {
4141
"@prettier/plugin-xml": "3.4.1",
42-
"bootstrap": "^5.3.5",
43-
"bootstrap-icons": "^1.11.3",
44-
"bootswatch": "^5.3.5",
42+
"bootstrap": "^5.3.6",
43+
"bootstrap-icons": "^1.13.1",
44+
"bootswatch": "^5.3.6",
4545
"lefthook": "^1.11.13",
4646
"prettier": "3.5.3",
4747
"stylelint": "^16.19.1",

‎plugin.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Copyright © 2017 · infotexture · Roger W. Fienhold Sheen -->
44
<!-- See the accompanying LICENSE file for applicable license -->
55
<plugin id="net.infotexture.dita-bootstrap">
6-
<feature extension="package.version" value="5.3.5.1"/>
6+
<feature extension="package.version" value="5.3.6"/>
77
<require plugin="org.dita.html5"/>
88
<require plugin="fox.jason.extend.css"/>
99
<!-- extension points -->

0 commit comments

Comments
 (0)