Skip to content

Commit

Permalink
Merge branch 'master' of github.com:squidfunk/mkdocs-material
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed May 17, 2019
2 parents 94d6f2c + d3622c6 commit ec571b2
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 38 deletions.
2 changes: 1 addition & 1 deletion docs/compliance.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ carefully.
Material makes fonts [easily configurable][2] by relying on Google Fonts CDN.
However, embedding fonts from Google is currently within a gray area as there's
no official statement or ruling regarding GDPR compliance and the topic is still
[actively discussed][3]. For this reason, if you need to ensure GDPR compiance,
[actively discussed][3]. For this reason, if you need to ensure GDPR compliance,
you should disable the usage of the Google Font CDN with:

``` yaml
Expand Down
2 changes: 1 addition & 1 deletion docs/customization.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ $md-color-accent: $clr-teal-a700;

Never make any changes in the `material` directory, as the contents of this
directory are automatically generated from the `src` directory and will be
overriden when the theme is built.
overridden when the theme is built.

[9]: http://localhost:8000

Expand Down
2 changes: 1 addition & 1 deletion docs/extensions/pymdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ emojis. Happy scrolling :tada:

[InlineHilite][18] adds support for inline code highlighting. It's useful for
short snippets included within body copy, e.g. `#!js var test = 0;` and can be
achived by prefixing inline code with a shebang and language identifier,
achieved by prefixing inline code with a shebang and language identifier,
e.g. `#!js`.

[18]: https://facelessuser.github.io/pymdown-extensions/extensions/inlinehilite/
Expand Down
77 changes: 47 additions & 30 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
"@babel/preset-env": "^7.4.4",
"autoprefixer": "^9.5.1",
"babel-eslint": "^10.0.0",
"babel-loader": "^8.0.5",
"babel-loader": "^8.0.6",
"chalk": "^2.4.2",
"clipboard": "^2.0.0",
"copy-webpack-plugin": "^5.0.3",
"css-loader": "^2.1.1",
"css-mqpacker": "^7.0.0",
"cssmin": "^0.4.3",
"custom-event-polyfill": "^1.0.7",
"customizr": "^1.2.1",
"customizr": "^1.3.0",
"eslint": "^5.16.0",
"event-hooks-webpack-plugin": "^2.1.1",
"expose-loader": "^0.7.4",
Expand All @@ -78,11 +78,11 @@
"stylelint": "^10.0.1",
"stylelint-config-standard": "^18.3.0",
"stylelint-order": "^3.0.0",
"stylelint-scss": "^3.6.0",
"stylelint-scss": "^3.6.1",
"uglifyjs-3-webpack-plugin": "^1.2.4",
"unfetch": "^3.0.0",
"webpack": "^4.30.0",
"webpack-cli": "^3.3.1",
"webpack": "^4.31.0",
"webpack-cli": "^3.3.2",
"webpack-manifest-plugin": "^2.0.4"
},
"engines": {
Expand Down

0 comments on commit ec571b2

Please sign in to comment.