Merge pull request #138 from jrappen/master

QingWei-Li · web-flow · commit 6aae64fd54f7 · 2017-03-19T18:45:43.000+08:00
Fixing some minor issues
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+.git/
diff --git a/.eslintrc b/.eslintrc
@@ -1,5 +1,7 @@
 {
-  "extends": ["vue"],
+  "extends": [
+    "vue"
+  ],
   "env": {
     "browser": true
   },
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-.DS_Store
 *.log
+.DS_Store
+/themes
 node_modules
-/themes
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,5 @@
+.eslintignore
+.eslintrc
+.github/
+.gitignore
+.travis.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 sudo: false
 cache:
   directories:
-  - $HOME/.yarn-cache
+    - $HOME/.yarn-cache
 language: node_js
 node_js: stable
+os:
+  - linux
+  - osx
diff --git a/dev.html b/dev.html
@@ -23,15 +23,14 @@
       '/zh-cn/changelog': '/changelog',
       '/changelog': 'https://raw.githubusercontent.com/QingWei-Li/docsify/master/CHANGELOG'
     },
+    auto2top: true,
+    basePath: '/docs/',
+    executeScript: true,
     loadNavbar: true,
-    executeScript: true
+    loadSidebar: true,
+    name: 'docsify',
+    subMaxLevel: 2
   }
 </script>
-<script
-  src="/lib/docsify.js"
-  data-name="docsify"
-  data-base-path="/docs/"
-  data-load-sidebar
-  data-sub-max-level="2"
-  data-auto2top></script>
+<script src="/lib/docsify.min.js"></script>
 </html>
diff --git a/docs/_navbar.md b/docs/_navbar.md
@@ -1,4 +1,4 @@
 - :uk:
  - [:cn: 中文](/zh-cn/)
- - [:de: German](/de-de/)
+ - [:de: Deutsch](/de-de/)
  - [:uk: English](/)
diff --git a/docs/de-de/_navbar.md b/docs/de-de/_navbar.md
@@ -1,4 +1,4 @@
 - :de:
  - [:cn: 中文](/zh-cn/)
- - [:de: German](/de-de/)
+ - [:de: Deutsch](/de-de/)
  - [:uk: English](/)
diff --git a/docs/zh-cn/_navbar.md b/docs/zh-cn/_navbar.md
@@ -1,4 +1,4 @@
 - :cn:
  - [:cn: 中文](/zh-cn/)
- - [:de: German](/de-de/)
+ - [:de: Deutsch](/de-de/)
  - [:uk: English](/)
diff --git a/package.json b/package.json
@@ -32,13 +32,13 @@
   },
   "devDependencies": {
     "cssnano": "^3.10.0",
-    "eslint": "^3.17.1",
+    "eslint": "^3.18.0",
     "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": "^0.41.6",
     "rollup-plugin-buble": "^0.15.0",
     "rollup-plugin-commonjs": "^8.0.2",
     "rollup-plugin-node-resolve": "^2.0.0",
diff --git a/src/themes/basic/_layout.css b/src/themes/basic/_layout.css
@@ -425,7 +425,17 @@ body.close {
   }
 }
 
-@media (max-width: 600px) {
+@media print {
+  .github-corner, .sidebar-toggle, .sidebar {
+    display: none;
+  }
+
+  nav {
+    display: none;
+  }
+}
+
+@media screen and (max-width: 768px) {
   .github-corner, .sidebar-toggle, .sidebar {
     position: fixed;
   }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`		`- "extends": ["vue"],`
	`2`	`+ "extends": [`
	`3`	`+ "vue"`
	`4`	`+ ],`
`3`	`5`	`"env": {`
`4`	`6`	`"browser": true`
`5`	`7`	`},`
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,17 @@ body.close {`
`425`	`425`	`}`
`426`	`426`	`}`
`427`	`427`
`428`		`-@media (max-width: 600px) {`
	`428`	`+@media print {`
	`429`	`+ .github-corner, .sidebar-toggle, .sidebar {`
	`430`	`+ display: none;`
	`431`	`+ }`
	`432`	`+`
	`433`	`+ nav {`
	`434`	`+ display: none;`
	`435`	`+ }`
	`436`	`+}`
	`437`	`+`
	`438`	`+@media screen and (max-width: 768px) {`
`429`	`439`	`.github-corner, .sidebar-toggle, .sidebar {`
`430`	`440`	`position: fixed;`
`431`	`441`	`}`