Skip to content

Commit 242db94

Browse files
Koooooo-7Koooooo-7
authored
Merge branch 'develop' into dependabot/npm_and_yarn/marked-2.0.0
2 parents d72bb83 + 6c13bdb commit 242db94

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ about: Create a report to help us improve
77
<!-- Please use English language -->
88
<!-- Before creating an issue please make sure you are using the latest version of Docsify. -->
99
<!-- Please ask questions on StackOverflow: https://stackoverflow.com/questions/ask?tags=docsify -->
10-
<!-- Please ask questions on gitter: https://gitter.im/docsifyjs/Lobby -->
10+
<!-- Please ask questions on Discord: https://discord.gg/3NwKFyR -->
1111

1212
## Bug Report
1313

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<a><img src="https://github.com/docsifyjs/docsify/workflows/Testing%20the%20e2e%20test%20suites/badge.svg?branch=develop&amp;event=push" alt="Testing the e2e test suites"></a>
1818
<a href="https://www.npmjs.com/package/docsify"><img alt="npm" src="https://img.shields.io/npm/v/docsify.svg?style=flat-square"></a>
1919
<a href="https://github.com/QingWei-Li/donate"><img alt="donate" src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square"></a>
20-
<a href="https://gitter.im/docsifyjs/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link"><img alt="gitter" src="https://img.shields.io/gitter/room/docsifyjs/docsify.svg?style=flat-square"></a>
20+
<a href="https://discord.gg/3NwKFyR"><img alt="Join Discord community and chat about Docsify" src="https://img.shields.io/discord/713647066802421792.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2&cacheSeconds=60"></a>
2121
<a href="https://gitpod.io/#https://github.com/docsifyjs/docsify"><img src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod" alt="Gitpod Ready-to-Code"></a>
2222
</p>
2323

@@ -36,7 +36,7 @@
3636
- [CLI](https://github.com/docsifyjs/docsify-cli)
3737
- CDN: [UNPKG](https://unpkg.com/docsify/) | [jsDelivr](https://cdn.jsdelivr.net/npm/docsify/) | [cdnjs](https://cdnjs.com/libraries/docsify)
3838
- [Awesome docsify](https://github.com/docsifyjs/awesome-docsify)
39-
- [Community chat](https://gitter.im/docsifyjs/Lobby)
39+
- [Community chat](https://discord.gg/3NwKFyR)
4040

4141
## Features
4242

‎docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please consider donating if you think docsify is helpful to you or that my work
2929

3030
## Community
3131

32-
Users and the development team are usually in the [Gitter chat room](https://gitter.im/docsifyjs/Lobby).
32+
Users and the development team are usually in the [Discord server](https://discord.gg/3NwKFyR).
3333

3434
## Special Thanks
3535

‎docs/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ Set the route alias. You can freely manage routing rules. Supports RegExp.
354354
```js
355355
window.$docsify = {
356356
alias: {
357-
'/foo/(+*)': '/bar/$1', // supports regexp
357+
'/foo/(.*)': '/bar/$1', // supports regexp
358358
'/zh-cn/changelog': '/changelog',
359359
'/changelog':
360360
'https://raw.githubusercontent.com/docsifyjs/docsify/master/CHANGELOG',

‎docs/index.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555

5656
<body>
5757
<div id="app">Loading ...</div>
58+
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1/index.js"></script>
5859
<script>
5960
// Set html "lang" attribute based on URL
6061
var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);
@@ -165,6 +166,7 @@
165166
},
166167
},
167168
plugins: [
169+
DocsifyCarbon.create('CEBI6KQE', 'docsifyjsorg'),
168170
function(hook, vm) {
169171
hook.beforeEach(function(html) {
170172
if (/githubusercontent\.com/.test(vm.route.file)) {
@@ -207,7 +209,6 @@
207209
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script>
208210
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
209211
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-php.min.js"></script>
210-
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1/index.min.js"></script>
211212
<script>
212213
(function() {
213214
function loadJS(src, attrs) {
@@ -218,13 +219,8 @@
218219

219220
// Public site only
220221
if (/docsify/.test(location.host)) {
221-
((window.gitter = {}).chat = {}).options = {
222-
room: 'docsifyjs/Lobby',
223-
};
224-
225222
loadJS('//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/ga.min.js');
226223
loadJS('//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/matomo.min.js');
227-
loadJS('//sidecar.gitter.im/dist/sidecar.v1.js', 'async defer');
228224
}
229225
})();
230226
</script>

‎docs/themes.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,27 @@
22

33
There is a handful of themes available, both official and community-made. Copy [Vue](//vuejs.org) and [buble](//buble.surge.sh) website custom theme and [@liril-net](https://github.com/liril-net) contribution to the theme of the black style.
44

5+
<!-- prettier-ignore-start -->
56
```html
6-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/vue.css">
7-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/buble.css">
8-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/dark.css">
9-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/pure.css">
7+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/vue.css" />
8+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/buble.css" />
9+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/dark.css" />
10+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/pure.css" />
1011
```
12+
<!-- prettier-ignore-end -->
1113

1214
!> Compressed files are available in `/lib/themes/`.
1315

16+
<!-- prettier-ignore-start -->
1417
```html
1518
<!-- compressed -->
1619

17-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/vue.css">
18-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/buble.css">
19-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/dark.css">
20-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/pure.css">
20+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/vue.css" />
21+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/buble.css" />
22+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/dark.css" />
23+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/pure.css" />
2124
```
25+
<!-- prettier-ignore-end -->
2226

2327
If you have any ideas or would like to develop a new theme, you are welcome to submit a [pull request](https://github.com/docsifyjs/docsify/pulls).
2428

@@ -47,10 +51,10 @@ If you have any ideas or would like to develop a new theme, you are welcome to s
4751
var themes = Docsify.dom.findAll('[rel="stylesheet"]');
4852

4953
preview.onclick = function (e) {
50-
var title = e.target.getAttribute('data-theme')
54+
var title = e.target.getAttribute('data-theme');
5155

5256
themes.forEach(function (theme) {
53-
theme.disabled = theme.title !== title
57+
theme.disabled = theme.title !== title;
5458
});
5559
};
5660
</script>

‎index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<link rel="stylesheet" href="/themes/dark.css" title="dark" disabled />
1010
<link rel="stylesheet" href="/themes/buble.css" title="buble" disabled />
1111
<link rel="stylesheet" href="/themes/pure.css" title="pure" disabled />
12-
<script src="//cdn.jsdelivr.net/npm/[email protected]/index.min.js"></script>
1312
<style>
1413
nav.app-nav li ul {
1514
min-width: 100px;
@@ -24,6 +23,7 @@
2423

2524
<body>
2625
<div id="app"></div>
26+
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1/index.min.js"></script>
2727
<script>
2828
// Set html "lang" attribute based on URL
2929
var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);

0 commit comments

Comments
 (0)