Merge branch 'master' into pr-puml

.all-contributorsrc

@@ -661,6 +661,16 @@
         "doc",
         "code"
       ]
+    },
+    {
+      "login": "jmestxr",
+      "name": "James",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87931905?v=4",
+      "profile": "https://jmestxr.github.io/my-portfolio/",
+      "contributions": [
+        "code",
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -122,6 +122,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SPWwj"><img src="https://avatars.githubusercontent.com/u/30100720?v=4?s=100" width="100px;" alt="SPWwj"/><br /><sub><b>SPWwj</b></sub></a><br /><a href="https://github.com/MarkBind/markbind/commits?author=SPWwj" title="Documentation">📖</a> <a href="https://github.com/MarkBind/markbind/commits?author=SPWwj" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jmestxr.github.io/my-portfolio/"><img src="https://avatars.githubusercontent.com/u/87931905?v=4?s=100" width="100px;" alt="James"/><br /><sub><b>James</b></sub></a><br /><a href="https://github.com/MarkBind/markbind/commits?author=jmestxr" title="Code">💻</a> <a href="https://github.com/MarkBind/markbind/commits?author=jmestxr" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

docs/about.md

@@ -127,6 +127,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SPWwj"><img src="https://avatars.githubusercontent.com/u/30100720?v=4?s=100" width="100px;" alt="SPWwj"/><br /><sub><b>SPWwj</b></sub></a><br /><a href="https://github.com/MarkBind/markbind/commits?author=SPWwj" title="Documentation">📖</a> <a href="https://github.com/MarkBind/markbind/commits?author=SPWwj" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jmestxr.github.io/my-portfolio/"><img src="https://avatars.githubusercontent.com/u/87931905?v=4?s=100" width="100px;" alt="James"/><br /><sub><b>James</b></sub></a><br /><a href="https://github.com/MarkBind/markbind/commits?author=jmestxr" title="Code">💻</a> <a href="https://github.com/MarkBind/markbind/commits?author=jmestxr" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

docs/devGuide/development/workflow.md

@@ -385,5 +385,9 @@ To update PlantUML to a newer version:
 1. Right-click on each image and save the image in `docs/userGuide/diagrams`.
 </box>
 
+### Updating Bootstrap and Bootswatch
+
+As Bootswatch is built on Bootstrap, ensure that the versions of both are in sync to avoid unexpected differences in styling behavior between default and other themes. Both are currently using version 5.1.3.
+
 {% from "njk/common.njk" import previous_next %}
-{{ previous_next('settingUp', 'writingComponents') }}
+{{ previous_next('settingUp', 'writingComponents') }}

packages/core/package.json

@@ -34,7 +34,7 @@
     "@sindresorhus/slugify": "^0.9.1",
     "@tlylt/markdown-it-imsize": "^3.0.0",
     "bluebird": "^3.7.2",
-    "bootswatch": "^5.1.3",
+    "bootswatch": "5.1.3",
     "cheerio": "^0.22.0",
     "crypto-js": "^4.0.0",
     "csv-parse": "^4.14.2",

packages/vue-components/src/Modal.vue

@@ -6,6 +6,7 @@
     v-model="show"
     ssr
     :name="id"
+    :classes="['modal']"
     :content-class="['modal-dialog', optionalModalSize, optionalCentering]"
     overlay-transition="none"
     :transition="effectClass"
@@ -126,6 +127,10 @@ export default {
 };
 </script>
 <style>
+    .modal {
+        display: block; /* to disable the display toggling provided by bootstrap. */
+    }
+
     .modal-dialog {
         inset: 0;
         position: absolute;

packages/vue-components/src/__tests__/__snapshots__/Modal.spec.js.snap

@@ -27,7 +27,7 @@ exports[`Modal can be centered 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -99,7 +99,7 @@ exports[`Modal can be large 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -171,7 +171,7 @@ exports[`Modal can be small 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -243,7 +243,7 @@ exports[`Modal should be closable by clicking the backdrop by default 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -315,7 +315,7 @@ exports[`Modal should be closable using the ok-text button 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -383,7 +383,7 @@ exports[`Modal should not be closable by clicking the backdrop if backdrop is se
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -455,7 +455,7 @@ exports[`Modal should not show footer when no footer is given 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -527,7 +527,7 @@ exports[`Modal should not show header when no header is given 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -589,7 +589,7 @@ exports[`Modal should show footer when both footer and ok-text are given 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"
@@ -649,7 +649,7 @@ exports[`Modal supports fade effect 1`] = `
     <div
       aria-expanded="false"
       aria-modal="true"
-      class="vfm__container vfm--absolute vfm--inset vfm--outline-none"
+      class="vfm__container vfm--absolute vfm--inset vfm--outline-none modal"
       data-v-1cd72822=""
       role="dialog"
       style="display: none;"