Skip to content

Commit

Permalink
Merge branch 'develop' into docsify-class
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
trusktr committed Jun 13, 2020
2 parents 3ec9e97 + da9af18 commit b15f450
Show file tree
Hide file tree
Showing 7 changed files with 681 additions and 1,077 deletions.
4 changes: 4 additions & 0 deletions .codesandbox/ci.json
@@ -0,0 +1,4 @@
{
"sandboxes": ["2d17z"],
"packages": [".", "packages/docsify-server-renderer"]
}
5 changes: 2 additions & 3 deletions build/css.js
Expand Up @@ -36,13 +36,12 @@ fs.readdir(path.join(__dirname, '../src/themes'), (err, files) => {
if (code !== 0) {
console.error(message);
process.exit(code)
} else {
console.log(message);
}
console.log(message);
});
} else {
return
}

})
})
})
2 changes: 0 additions & 2 deletions docs/cover.md
Expand Up @@ -34,8 +34,6 @@ Set `coverpage` to **true**, and create a `_coverpage.md`:
[Get Started](#docsify)
```

!> A document site can have only one coverpage!

## Custom background

The background color is generated randomly by default. You can customize the background color or a background image:
Expand Down
17 changes: 2 additions & 15 deletions docs/index.html
Expand Up @@ -9,20 +9,14 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="keywords" content="doc,docs,documentation,gitbook,creator,generator,github,jekyll,github-pages">
<meta name="description" content="A magical documentation generator.">

<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<link
rel="stylesheet"
href="//cdn.jsdelivr.net/npm/docsify-darklight-theme@3/dist/docsify-style.min.css"
title="docsify-darklight-theme"
type="text/css"
/>
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/vue.css" title="vue" disabled>
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/vue.css" title="vue">
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/dark.css" title="dark" disabled>
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/buble.css" title="buble" disabled>
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/pure.css" title="pure" disabled>

<script src="//cdn.jsdelivr.net/npm/docsify-plugin-codefund/index.js"></script>

<style>
nav.app-nav li ul {
min-width: 100px;
Expand Down Expand Up @@ -70,9 +64,6 @@
'/': 'Search'
}
},
darklightTheme: {
bodyFontSize : '15px',
},
formatUpdated: '{MM}/{DD} {HH}:{mm}',
plugins: [
function (hook, vm) {
Expand Down Expand Up @@ -107,10 +98,6 @@
<script src="//cdn.jsdelivr.net/npm/prismjs/components/prism-bash.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs/components/prism-markdown.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs/components/prism-nginx.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/docsify-darklight-theme@3/dist/index.min.js"
type="text/javascript">
</script>
<script>
((window.gitter = {}).chat = {}).options = {
room: 'docsifyjs/Lobby'
Expand Down

0 comments on commit b15f450

Please sign in to comment.