Merge pull request #132 from jrappen/master

fix some minor issues
This commit is contained in:
cinwell.li 2017-03-16 06:37:26 +08:00 committed by GitHub
commit 65a6b3c659
8 changed files with 106 additions and 102 deletions

View file

@ -9,7 +9,7 @@
</p>
<p align="center">
<a href="https://travis-ci.org/QingWei-Li/docsify"><img alt="Travis Status" src="https://img.shields.io/travis/rust-lang/rust/master.svg?style=flat-square"></a>
<a href="https://travis-ci.org/QingWei-Li/docsify"><img alt="Travis Status" src="https://img.shields.io/travis/QingWei-Li/docsify/master.svg?style=flat-square"></a>
<a href="https://www.npmjs.com/package/docsify"><img alt="npm" src="https://img.shields.io/npm/v/docsify.svg?style=flat-square"></a>
<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>
</p>
@ -39,12 +39,12 @@ Create an `index.html`.
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="//unpkg.com/docsify/themes/vue.css">
<link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css">
</head>
<body>
<div id="app"></div>
</body>
<script src="//unpkg.com/docsify"></script>
<script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
</html>
```

View file

@ -19,6 +19,7 @@
<script>
window.$docsify = {
alias: {
'/de-de/changelog': '/changelog',
'/zh-cn/changelog': '/changelog',
'/changelog': 'https://raw.githubusercontent.com/QingWei-Li/docsify/master/CHANGELOG'
},

View file

@ -2,11 +2,21 @@
"name": "docsify",
"version": "3.4.2",
"description": "A magical documentation generator.",
"author": {
"name": "qingwei-li",
"email": "cinwell.li@gmail.com",
"url": "https://github.com/QingWei-Li"
},
"homepage": "https://docsify.js.org",
"license": "MIT",
"repository": {
"type": "git",
"url": "git+https://github.com/QingWei-Li/docsify.git"
},
"main": "lib/docsify.js",
"files": [
"lib",
"src",
"themes"
"src"
],
"scripts": {
"build": "rm -rf lib themes && node build/build.js && mkdir lib/themes && mkdir themes && node build/build-css.js",
@ -14,9 +24,26 @@
"dev": "node app.js & nodemon -w src -e js,css --exec 'npm run dev:build'",
"test": "eslint src"
},
"repository": {
"type": "git",
"url": "https://github.com/QingWei-Li/docsify.git"
"dependencies": {
"marked": "^0.3.6",
"prismjs": "^1.6.0",
"zoom-image": "^0.1.4"
},
"devDependencies": {
"cssnano": "^3.10.0",
"eslint": "^3.17.1",
"eslint-config-vue": "^2.0.2",
"eslint-plugin-vue": "^2.0.1",
"nodemon": "^1.11.0",
"postcss": "^5.2.16",
"postcss-salad": "^1.0.8",
"rollup": "^0.41.5",
"rollup-plugin-buble": "^0.15.0",
"rollup-plugin-commonjs": "^8.0.2",
"rollup-plugin-node-resolve": "^2.0.0",
"rollup-plugin-string": "^2.0.2",
"rollup-plugin-uglify": "^1.0.1",
"serve-static": "^1.12.1"
},
"keywords": [
"doc",
@ -24,29 +51,5 @@
"documentation",
"creator",
"generator"
],
"author": "qingwei-li <cinwell.li@gmail.com> (https://github.com/QingWei-Li)",
"homepage": "https://docsify.js.org",
"license": "MIT",
"devDependencies": {
"cssnano": "^3.8.1",
"eslint": "^3.10.2",
"eslint-config-vue": "^2.0.1",
"eslint-plugin-vue": "^1.0.0",
"nodemon": "^1.11.0",
"postcss": "^5.2.6",
"postcss-salad": "^1.0.5",
"rollup": "^0.41.1",
"rollup-plugin-buble": "^0.15.0",
"rollup-plugin-commonjs": "^7.0.0",
"rollup-plugin-node-resolve": "^2.0.0",
"rollup-plugin-string": "^2.0.2",
"rollup-plugin-uglify": "^1.0.1",
"serve-static": "^1.11.1"
},
"dependencies": {
"marked": "^0.3.6",
"prismjs": "^1.5.1",
"zoom-image": "^0.1.4"
}
]
}

View file

@ -72,16 +72,16 @@ section.cover {
.cover-main > p:last-child a {
border-color: var(--theme-color, $color-primary);
border-radius: 2em;
border-radius: 2rem;
border-style: solid;
border-width: 1px;
box-sizing: border-box;
color: var(--theme-color, $color-primary);
display: inline-block;
font-size: 1.05em;
letter-spacing: 0.1em;
margin-right: 1em;
padding: 0.75em 2em;
font-size: 1.05rem;
letter-spacing: 0.1rem;
margin-right: 1rem;
padding: 0.75em 2rem;
text-decoration: none;
transition: all 0.15s ease;

View file

@ -27,7 +27,7 @@ div#app {
}
.emoji {
height: 1.2em;
height: 1.2rem;
vertical-align: middle;
}
@ -100,7 +100,7 @@ nav.app-nav {
}
>a {
margin: 0 1em;
margin: 0 1rem;
padding: 5px 0;
}
@ -129,7 +129,7 @@ nav.app-nav {
/* navbar dropdown */
li {
display: inline-block;
margin: 0 1em;
margin: 0 1rem;
padding: 5px 0;
position: relative;
@ -152,7 +152,7 @@ nav.app-nav {
li {
display: block;
font-size: 14px;
line-height: 1em;
line-height: 1rem;
margin: 0;
margin: 8px 14px;
white-space: nowrap;
@ -229,8 +229,8 @@ main {
z-index: 20;
> h1 {
margin: 0 auto 1em;
font-size: 1.5em;
margin: 0 auto 1rem;
font-size: 1.5rem;
font-weight: 300;
text-align: center;
@ -348,7 +348,7 @@ body.sticky {
border-collapse: collapse;
border-spacing: 0;
display: block;
margin-bottom: 1em;
margin-bottom: 1rem;
overflow: auto;
width: 100%;
}
@ -408,7 +408,7 @@ body.sticky {
.markdown-section p.warn {
background: rgba($color-primary, 0.1);
border-radius: 2px;
padding: 1em;
padding: 1rem;
}
body.close {

View file

@ -3,7 +3,7 @@
$color-primary: #0074D9;
$color-bg: #fff;
$color-text: #34495e;
$sidebar-width: 16em;
$sidebar-width: 16rem;
@import "basic/layout";
@import "basic/coverpage";
@ -21,7 +21,7 @@ $sidebar-width: 16em;
li {
list-style: none;
margin: 0;
padding: 0.2em 0 0.2em 1em;
padding: 0.2em 0 0.2em 1rem;
}
ul li ul {
@ -54,40 +54,40 @@ $sidebar-width: 16em;
.markdown-section p,
.markdown-section ul,
.markdown-section ol {
line-height: 1.6em;
line-height: 1.6rem;
margin: 0 0 1em 0;
word-spacing: 0.05em;
word-spacing: 0.05rem;
}
.markdown-section h1 {
font-size: 2em;
font-size: 2rem;
font-weight: 500;
margin: 0 0 1em;
margin: 0 0 1rem;
}
.markdown-section h2 {
font-size: 1.8em;
font-size: 1.8rem;
font-weight: 400;
margin: 0 0 1rem 0;
padding: 1rem 0 0 0;
}
.markdown-section h3 {
font-size: 1.5em;
margin: 52px 0 1.2em;
font-size: 1.5rem;
margin: 52px 0 1.2rem;
}
.markdown-section h4 {
font-size: 1.25em;
font-size: 1.25rem;
}
.markdown-section h5 {
font-size: 1em;
font-size: 1rem;
}
.markdown-section h6 {
color: #777;
font-size: 1em;
font-size: 1rem;
}
.markdown-section figure,
@ -99,7 +99,7 @@ $sidebar-width: 16em;
.markdown-section ul,
.markdown-section ol {
padding-left: 1.5em;
padding-left: 1.5rem;
}
.markdown-section li {
@ -131,7 +131,7 @@ $sidebar-width: 16em;
background-color: #f9f9f9;
border-radius: 3px;
font-family: Inconsolata;
padding: 0.2em 0.4em;
padding: 0.2em 0.4rem;
white-space: pre;
}
@ -221,7 +221,7 @@ $sidebar-width: 16em;
border-radius: 2px;
display: block;
font-family: Inconsolata;
line-height: 1.1em;
line-height: 1.1rem;
max-width: inherit;
overflow: inherit;
padding: 20px 0.8em 20px;
@ -229,11 +229,11 @@ $sidebar-width: 16em;
}
.markdown-section code::after, .markdown-section code::before {
letter-spacing: 0.05em;
letter-spacing: 0.05rem;
}
code .token {
-webkit-font-smoothing: initial;
-moz-osx-font-smoothing: initial;
min-height: 1.5em;
min-height: 1.5rem;
}

View file

@ -50,7 +50,7 @@ body {
.markdown-section h3,
.markdown-section h4,
.markdown-section strong {
color: #2c3e50;
color: #657b83;
font-weight: 600;
}
@ -60,31 +60,31 @@ body {
}
.markdown-section h1 {
font-size: 2em;
margin: 0 0 1em;
font-size: 2rem;
margin: 0 0 1rem;
}
.markdown-section h2 {
font-size: 1.75em;
margin: 45px 0 0.8em;
font-size: 1.75rem;
margin: 45px 0 0.8rem;
}
.markdown-section h3 {
font-size: 1.5em;
margin: 40px 0 .6em;
font-size: 1.5rem;
margin: 40px 0 .6rem;
}
.markdown-section h4 {
font-size: 1.25em;
font-size: 1.25rem;
}
.markdown-section h5 {
font-size: 1em;
font-size: 1rem;
}
.markdown-section h6 {
color: #777;
font-size: 1em;
font-size: 1rem;
}
.markdown-section figure,
@ -97,13 +97,13 @@ body {
.markdown-section p,
.markdown-section ul,
.markdown-section ol {
line-height: 1.6em;
word-spacing: 0.05em;
line-height: 1.6rem;
word-spacing: 0.05rem;
}
.markdown-section ul,
.markdown-section ol {
padding-left: 1.5em;
padding-left: 1.5rem;
}
.markdown-section blockquote {
@ -131,7 +131,7 @@ body {
border-radius: 2px;
color: #657b83;
font-family: 'Roboto Mono', Monaco, courier, monospace;
font-size: 0.8em;
font-size: 0.8rem;
margin: 0 2px;
padding: 3px 5px;
white-space: nowrap;
@ -142,10 +142,10 @@ body {
-webkit-font-smoothing: initial;
background-color: #282828;
font-family: 'Roboto Mono', Monaco, courier, monospace;
line-height: 1.5em;
line-height: 1.5rem;
margin: 1.2em 0;
overflow: auto;
padding: 0 1.4em;
padding: 0 1.4rem;
position: relative;
word-wrap: normal;
}
@ -254,7 +254,7 @@ body {
color: #657b83;
display: block;
font-family: 'Roboto Mono', Monaco, courier, monospace;
font-size: 0.8em;
font-size: 0.8rem;
line-height: inherit;
margin: 0 2px;
max-width: inherit;
@ -264,19 +264,19 @@ body {
}
.markdown-section code::after, .markdown-section code::before {
letter-spacing: 0.05em;
letter-spacing: 0.05rem;
}
code .token {
-moz-osx-font-smoothing: initial;
-webkit-font-smoothing: initial;
min-height: 1.5em;
min-height: 1.5rem;
}
pre::after {
color: #ccc;
content: attr(data-lang);
font-size: 0.6em;
font-size: 0.6rem;
font-weight: 600;
height: 15px;
line-height: 15px;

View file

@ -71,31 +71,31 @@ body {
}
.markdown-section h1 {
font-size: 2em;
margin: 0 0 1em;
font-size: 2rem;
margin: 0 0 1rem;
}
.markdown-section h2 {
font-size: 1.75em;
margin: 45px 0 0.8em;
font-size: 1.75rem;
margin: 45px 0 0.8rem;
}
.markdown-section h3 {
font-size: 1.5em;
margin: 40px 0 .6em;
font-size: 1.5rem;
margin: 40px 0 .6rem;
}
.markdown-section h4 {
font-size: 1.25em;
font-size: 1.25rem;
}
.markdown-section h5 {
font-size: 1em;
font-size: 1rem;
}
.markdown-section h6 {
color: #777;
font-size: 1em;
font-size: 1rem;
}
.markdown-section figure,
@ -108,13 +108,13 @@ body {
.markdown-section p,
.markdown-section ul,
.markdown-section ol {
line-height: 1.6em;
word-spacing: 0.05em;
line-height: 1.6rem;
word-spacing: 0.05rem;
}
.markdown-section ul,
.markdown-section ol {
padding-left: 1.5em;
padding-left: 1.5rem;
}
.markdown-section blockquote {
@ -142,7 +142,7 @@ body {
border-radius: 2px;
color: #e96900;
font-family: 'Roboto Mono', Monaco, courier, monospace;
font-size: 0.8em;
font-size: 0.8rem;
margin: 0 2px;
padding: 3px 5px;
white-space: nowrap;
@ -153,10 +153,10 @@ body {
-webkit-font-smoothing: initial;
background-color: #f8f8f8;
font-family: 'Roboto Mono', Monaco, courier, monospace;
line-height: 1.5em;
line-height: 1.5rem;
margin: 1.2em 0;
overflow: auto;
padding: 0 1.4em;
padding: 0 1.4rem;
position: relative;
word-wrap: normal;
}
@ -265,7 +265,7 @@ body {
color: #525252;
display: block;
font-family: 'Roboto Mono', Monaco, courier, monospace;
font-size: 0.8em;
font-size: 0.8rem;
line-height: inherit;
margin: 0 2px;
max-width: inherit;
@ -275,19 +275,19 @@ body {
}
.markdown-section code::after, .markdown-section code::before {
letter-spacing: 0.05em;
letter-spacing: 0.05rem;
}
code .token {
-moz-osx-font-smoothing: initial;
-webkit-font-smoothing: initial;
min-height: 1.5em;
min-height: 1.5rem;
}
pre::after {
color: #ccc;
content: attr(data-lang);
font-size: 0.6em;
font-size: 0.6rem;
font-weight: 600;
height: 15px;
line-height: 15px;