Skip to content

Commit 57c410c

Browse files
authored
Merge branch 'develop' into fix/autoHeader
2 parents 47f8ab7 + 3c114d1 commit 57c410c

7 files changed

Lines changed: 8639 additions & 4992 deletions

File tree

docs/_sidebar.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
- [Embed Files](embed-files.md)
2828
- [UI Kit](ui-kit.md)
2929

30-
- [Awesome docsify](awesome.md)
31-
- [Changelog](changelog.md)
30+
* [Awesome docsify](awesome.md)
31+
* [Changelog](changelog.md)

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"glob": "^11.0.1",
6767
"globals": "^16.0.0",
6868
"husky": "^9.0.11",
69-
"jest": "^29.7.0",
69+
"jest": "^30.0.4",
7070
"jest-environment-jsdom": "^29.7.0",
7171
"lint-staged": "^16.1.0",
7272
"marked": "^16.0.0",

src/core/event/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ export function Events(Base) {
244244
dom.on(sidebarElm, 'click', ({ target }) => {
245245
const linkElm = target.closest('a');
246246
const linkParent = linkElm?.closest('li');
247-
const subSidebar = linkParent?.querySelector('.app-sub-sidebar');
247+
const hasSubSidebar = linkParent?.querySelector('.app-sub-sidebar');
248248

249-
if (subSidebar) {
249+
if (hasSubSidebar) {
250250
dom.toggleClass(linkParent, 'collapse');
251251
}
252252
});

src/core/fetch/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable no-unused-vars */
21
import { getParentPath, stringifyQuery } from '../router/util.js';
32
import { noop, isExternal } from '../util/core.js';
43
import { get } from '../util/ajax.js';
@@ -262,8 +261,6 @@ export function Fetch(Base) {
262261
}
263262

264263
initFetch() {
265-
const { loadSidebar } = this.config;
266-
267264
this.$fetch(_ => this.callHook('ready'));
268265
}
269266
};

src/themes/shared/_markdown.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@
251251

252252
/* Prevent long titles from causing horizontal scrolling */
253253
&[id] a {
254-
overflow: hidden;
254+
overflow-x: clip;
255+
overflow-y: visible;
255256
text-overflow: ellipsis;
256257
}
257258
}

test/integration/__snapshots__/docs.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ exports[`Docs Site sidebar renders and is unchanged 1`] = `
2525
2626
<div class="sidebar-nav" role="navigation" aria-label="primary"><!-- markdownlint-disable first-line-h1 -->
2727
28-
<ul><li><p>Getting started</p><ul><li><a href="#/quickstart" class="page-link">Quick start</a></li><li><a href="#/adding-pages" class="page-link">Adding pages</a></li><li><a href="#/cover" class="page-link">Cover page</a></li><li><a href="#/custom-navbar" class="page-link">Custom navbar</a></li></ul></li><li><p>Customization</p><ul><li><a href="#/configuration" class="page-link">Configuration</a></li><li><a href="#/themes" class="page-link">Themes</a></li><li><a href="#/plugins" class="page-link">List of Plugins</a></li><li><a href="#/write-a-plugin" class="page-link">Write a Plugin</a></li><li><a href="#/markdown" class="page-link">Markdown configuration</a></li><li><a href="#/language-highlight" class="page-link">Language highlighting</a></li><li><a href="#/emoji" class="page-link">Emoji</a></li></ul></li><li><p>Guide</p><ul><li><a href="#/deploy" class="page-link">Deploy</a></li><li><a href="#/helpers" class="page-link">Helpers</a></li><li><a href="#/vue" class="page-link">Vue compatibility</a></li><li><a href="#/cdn" class="page-link">CDN</a></li><li><a href="#/pwa" class="page-link">Offline Mode (PWA)</a></li><li><a href="#/embed-files" class="page-link">Embed Files</a></li><li><a href="#/ui-kit" class="page-link">UI Kit</a></li></ul></li><li><p><a href="#/awesome" class="page-link">Awesome docsify</a></p></li><li><p><a href="#/changelog" class="page-link">Changelog</a></p></li></ul></div>
28+
<ul><li><p>Getting started</p><ul><li><a href="#/quickstart" class="page-link">Quick start</a></li><li><a href="#/adding-pages" class="page-link">Adding pages</a></li><li><a href="#/cover" class="page-link">Cover page</a></li><li><a href="#/custom-navbar" class="page-link">Custom navbar</a></li></ul></li><li><p>Customization</p><ul><li><a href="#/configuration" class="page-link">Configuration</a></li><li><a href="#/themes" class="page-link">Themes</a></li><li><a href="#/plugins" class="page-link">List of Plugins</a></li><li><a href="#/write-a-plugin" class="page-link">Write a Plugin</a></li><li><a href="#/markdown" class="page-link">Markdown configuration</a></li><li><a href="#/language-highlight" class="page-link">Language highlighting</a></li><li><a href="#/emoji" class="page-link">Emoji</a></li></ul></li><li><p>Guide</p><ul><li><a href="#/deploy" class="page-link">Deploy</a></li><li><a href="#/helpers" class="page-link">Helpers</a></li><li><a href="#/vue" class="page-link">Vue compatibility</a></li><li><a href="#/cdn" class="page-link">CDN</a></li><li><a href="#/pwa" class="page-link">Offline Mode (PWA)</a></li><li><a href="#/embed-files" class="page-link">Embed Files</a></li><li><a href="#/ui-kit" class="page-link">UI Kit</a></li></ul></li></ul><ul><li><a href="#/awesome" class="page-link">Awesome docsify</a></li><li><a href="#/changelog" class="page-link">Changelog</a></li></ul></div>
2929
</aside>"
3030
`;

0 commit comments

Comments
 (0)