Skip to content

Commit b15f450

Browse files
committed
Merge branch 'develop' into docsify-class
* develop: Update build/css.js use a port for the tests that doesn't collide with common local server ports Revert "Updated docs site dark and light mode with switch and redesigned search bar using docsify-darklight-theme" (#1207) ci: added codesandbox build preview for PR reviews (#1193) Update cover.md (#1134) chore: update auto format config
2 parents 3ec9e97 + da9af18 commit b15f450

File tree

7 files changed

+681
-1077
lines changed

7 files changed

+681
-1077
lines changed

.codesandbox/ci.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"sandboxes": ["2d17z"],
3+
"packages": [".", "packages/docsify-server-renderer"]
4+
}

build/css.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,12 @@ fs.readdir(path.join(__dirname, '../src/themes'), (err, files) => {
3636
if (code !== 0) {
3737
console.error(message);
3838
process.exit(code)
39-
} else {
40-
console.log(message);
4139
}
40+
console.log(message);
4241
});
4342
} else {
4443
return
4544
}
4645

4746
})
48-
})
47+
})

docs/cover.md

-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ Set `coverpage` to **true**, and create a `_coverpage.md`:
3434
[Get Started](#docsify)
3535
```
3636

37-
!> A document site can have only one coverpage!
38-
3937
## Custom background
4038

4139
The background color is generated randomly by default. You can customize the background color or a background image:

docs/index.html

+2-15
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,14 @@
99
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
1010
<meta name="keywords" content="doc,docs,documentation,gitbook,creator,generator,github,jekyll,github-pages">
1111
<meta name="description" content="A magical documentation generator.">
12-
1312
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
14-
<link
15-
rel="stylesheet"
16-
href="//cdn.jsdelivr.net/npm/docsify-darklight-theme@3/dist/docsify-style.min.css"
17-
title="docsify-darklight-theme"
18-
type="text/css"
19-
/>
20-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/vue.css" title="vue" disabled>
13+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/vue.css" title="vue">
2114
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/dark.css" title="dark" disabled>
2215
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/buble.css" title="buble" disabled>
2316
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/pure.css" title="pure" disabled>
2417

2518
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-codefund/index.js"></script>
19+
2620
<style>
2721
nav.app-nav li ul {
2822
min-width: 100px;
@@ -70,9 +64,6 @@
7064
'/': 'Search'
7165
}
7266
},
73-
darklightTheme: {
74-
bodyFontSize : '15px',
75-
},
7667
formatUpdated: '{MM}/{DD} {HH}:{mm}',
7768
plugins: [
7869
function (hook, vm) {
@@ -107,10 +98,6 @@
10798
<script src="//cdn.jsdelivr.net/npm/prismjs/components/prism-bash.min.js"></script>
10899
<script src="//cdn.jsdelivr.net/npm/prismjs/components/prism-markdown.min.js"></script>
109100
<script src="//cdn.jsdelivr.net/npm/prismjs/components/prism-nginx.min.js"></script>
110-
<script
111-
src="//cdn.jsdelivr.net/npm/docsify-darklight-theme@3/dist/index.min.js"
112-
type="text/javascript">
113-
</script>
114101
<script>
115102
((window.gitter = {}).chat = {}).options = {
116103
room: 'docsifyjs/Lobby'

0 commit comments

Comments
 (0)