Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
anikethsaha authored Dec 12, 2019
2 parents 1622578 + 8bf4b06 commit 68327c5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
3 changes: 1 addition & 2 deletions docs/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ server {

### HTML5 router

When using the HTML5 router, you need to set up redirect rules that redirect all requests to your `index.html`, it's pretty simple when you're using Netlify, populate a `\redirects` file in the docs directory and you're all set:
When using the HTML5 router, you need to set up redirect rules that redirect all requests to your `index.html`, it's pretty simple when you're using Netlify, create a file named `_redirects` in the docs directory, add this snippet to the file and you're all set:

```sh
/* /index.html 200
Expand Down Expand Up @@ -134,4 +134,3 @@ frontend:
|----------------|----------------|---------------|
| /<*>.md | /<*>.md | 200 (Rewrite) |
| /<*> | /index.html | 200 (Rewrite) |

6 changes: 3 additions & 3 deletions docs/more-pages.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Matching routes

```text
docs/README.md => http://domain.com
docs/guide.md => http://domain.com/guide
docs/zh-cn/README.md => http://domain.com/zh-cn/
docs/zh-cn/guide.md => http://domain.com/zh-cn/guide
docs/guide.md => http://domain.com/#/guide
docs/zh-cn/README.md => http://domain.com/#/zh-cn/
docs/zh-cn/guide.md => http://domain.com/#/zh-cn/guide
```

## Sidebar
Expand Down
2 changes: 1 addition & 1 deletion packages/docsify-server-renderer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/themes/buble.styl
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@ $sidebar-width = 16rem
color #333
font-weight 400

.markdown-section strong
color #333
font-weight 600

.markdown-section a
color var(--theme-color, $color-primary)
font-weight 400

.markdown-section p, .markdown-section ul, .markdown-section ol
line-height 1.6rem
Expand Down

0 comments on commit 68327c5

Please sign in to comment.