Skip to content

Commit

Permalink
Merge pull request #138 from jrappen/master
Browse files Browse the repository at this point in the history
Fixing some minor issues
  • Loading branch information
QingWei-Li committed Mar 19, 2017
2 parents 2c2ac5f + 33b7c51 commit 6aae64f
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 18 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.git/
4 changes: 3 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"extends": ["vue"],
"extends": [
"vue"
],
"env": {
"browser": true
},
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.DS_Store
*.log
.DS_Store
/themes
node_modules
/themes
5 changes: 5 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.eslintignore
.eslintrc
.github/
.gitignore
.travis.yml
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
sudo: false
cache:
directories:
- $HOME/.yarn-cache
- $HOME/.yarn-cache
language: node_js
node_js: stable
os:
- linux
- osx
15 changes: 7 additions & 8 deletions dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion docs/_navbar.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- :uk:
- [:cn: 中文](/zh-cn/)
- [:de: German](/de-de/)
- [:de: Deutsch](/de-de/)
- [:uk: English](/)
2 changes: 1 addition & 1 deletion docs/de-de/_navbar.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- :de:
- [:cn: 中文](/zh-cn/)
- [:de: German](/de-de/)
- [:de: Deutsch](/de-de/)
- [:uk: English](/)
2 changes: 1 addition & 1 deletion docs/zh-cn/_navbar.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- :cn:
- [:cn: 中文](/zh-cn/)
- [:de: German](/de-de/)
- [:de: Deutsch](/de-de/)
- [:uk: English](/)
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 11 additions & 1 deletion src/themes/basic/_layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 6aae64f

Please sign in to comment.