OpenSourceArk/mkdocs-material
1
0
Fork 0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-06-14 11:52:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:squidfunk/mkdocs-material

Browse Source
This commit is contained in:
squidfunk
2019-05-17 18:57:19 +02:00
parent 94d6f2c68b d3622c6c0f
commit ec571b2af5
5 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/compliance.md
View File

@@ -17,7 +17,7 @@ carefully.
Material makes fonts [easily configurable][2] by relying on Google Fonts CDN. 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 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 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: you should disable the usage of the Google Font CDN with:
``` yaml ``` yaml

2
docs/customization.md
View File

@@ -220,7 +220,7 @@ $md-color-accent: $clr-teal-a700;
Never make any changes in the `material` directory, as the contents of this Never make any changes in the `material` directory, as the contents of this
directory are automatically generated from the `src` directory and will be 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 [9]: http://localhost:8000

2
docs/extensions/pymdown.md
View File

@@ -202,7 +202,7 @@ emojis. Happy scrolling :tada:
[InlineHilite][18] adds support for inline code highlighting. It's useful for [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 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`. e.g. `#!js`.
[18]: https://facelessuser.github.io/pymdown-extensions/extensions/inlinehilite/ [18]: https://facelessuser.github.io/pymdown-extensions/extensions/inlinehilite/

77
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "mkdocs-material", "name": "mkdocs-material",
"version": "4.1.2", "version": "4.2.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@@ -1943,11 +1943,12 @@
} }
}, },
"assert": { "assert": {
"version": "1.4.1", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
"integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
"dev": true, "dev": true,
"requires": { "requires": {
"object-assign": "^4.1.1",
"util": "0.10.3" "util": "0.10.3"
}, },
"dependencies": { "dependencies": {
@@ -2105,25 +2106,25 @@
} }
}, },
"babel-loader": { "babel-loader": {
"version": "8.0.5", "version": "8.0.6",
"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
"integrity": "sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==", "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
"dev": true, "dev": true,
"requires": { "requires": {
"find-cache-dir": "^2.0.0", "find-cache-dir": "^2.0.0",
"loader-utils": "^1.0.2", "loader-utils": "^1.0.2",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"util.promisify": "^1.0.0" "pify": "^4.0.1"
}, },
"dependencies": { "dependencies": {
"find-cache-dir": { "find-cache-dir": {
"version": "2.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
"integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"commondir": "^1.0.1", "commondir": "^1.0.1",
"make-dir": "^1.0.0", "make-dir": "^2.0.0",
"pkg-dir": "^3.0.0" "pkg-dir": "^3.0.0"
} }
}, },
@@ -2146,10 +2147,20 @@
"path-exists": "^3.0.0" "path-exists": "^3.0.0"
} }
}, },
"p-limit": { "make-dir": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
"integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
"dev": true,
"requires": {
"pify": "^4.0.1",
"semver": "^5.6.0"
}
},
"p-limit": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
"integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"p-try": "^2.0.0" "p-try": "^2.0.0"
@@ -2165,9 +2176,15 @@
} }
}, },
"p-try": { "p-try": {
"version": "2.0.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
"integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
"dev": true
},
"pify": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
"dev": true "dev": true
}, },
"pkg-dir": { "pkg-dir": {
@@ -4592,9 +4609,9 @@
"dev": true "dev": true
}, },
"customizr": { "customizr": {
"version": "1.2.1", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/customizr/-/customizr-1.2.1.tgz", "resolved": "https://registry.npmjs.org/customizr/-/customizr-1.3.0.tgz",
"integrity": "sha512-ehwfABmC5eQQ3rGdvQnPUJEwolIvD3kYEQTM3+w6JH1SHaSRYKgnqLDv3+h030ZhmpoTyZlGmI66286LdILw5Q==", "integrity": "sha512-ZBnaJBTXD05tJPoG992dCFlUAt9AdhwCzHLWBJfbIDB9qkqRBJm8OkT6R5I0ZL97Qa4eJRe8GlCnW06i8ZYlfw==",
"dev": true, "dev": true,
"requires": { "requires": {
"colors": "^1.3.3", "colors": "^1.3.3",
@@ -12310,9 +12327,9 @@
} }
}, },
"stylelint-scss": { "stylelint-scss": {
"version": "3.6.0", "version": "3.6.1",
"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.6.0.tgz", "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.6.1.tgz",
"integrity": "sha512-Qpw0gl6iLBon5JNeFZjVYOEayd/e+WYIdY2vFhZuXeHC6jb8wl0wRZY97jATt/uxZzdtU3tGLAvJOUMuFp18vw==", "integrity": "sha512-6bB2EHUZsE/bDVKUdzBXqOcfgXmg3zq9Lglgbu16EqMa4PM8Y48XKcB8coOj8CKr07GtlqtOdCNA2E5njoI9Kw==",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.11", "lodash": "^4.17.11",
@@ -13389,9 +13406,9 @@
} }
}, },
"webpack": { "webpack": {
"version": "4.30.0", "version": "4.31.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.30.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.31.0.tgz",
"integrity": "sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==", "integrity": "sha512-n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@webassemblyjs/ast": "1.8.5", "@webassemblyjs/ast": "1.8.5",
@@ -13444,9 +13461,9 @@
} }
}, },
"webpack-cli": { "webpack-cli": {
"version": "3.3.1", "version": "3.3.2",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.1.tgz", "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.2.tgz",
"integrity": "sha512-c2inFU7SM0IttEgF7fK6AaUsbBnORRzminvbyRKS+NlbQHVZdCtzKBlavRL5359bFsywXGRAItA5di/IruC8mg==", "integrity": "sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==",
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "^2.4.1", "chalk": "^2.4.1",

10
package.json
View File

@@ -45,7 +45,7 @@
"@babel/preset-env": "^7.4.4", "@babel/preset-env": "^7.4.4",
"autoprefixer": "^9.5.1", "autoprefixer": "^9.5.1",
"babel-eslint": "^10.0.0", "babel-eslint": "^10.0.0",
"babel-loader": "^8.0.5", "babel-loader": "^8.0.6",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"clipboard": "^2.0.0", "clipboard": "^2.0.0",
"copy-webpack-plugin": "^5.0.3", "copy-webpack-plugin": "^5.0.3",
@@ -53,7 +53,7 @@
"css-mqpacker": "^7.0.0", "css-mqpacker": "^7.0.0",
"cssmin": "^0.4.3", "cssmin": "^0.4.3",
"custom-event-polyfill": "^1.0.7", "custom-event-polyfill": "^1.0.7",
"customizr": "^1.2.1", "customizr": "^1.3.0",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"event-hooks-webpack-plugin": "^2.1.1", "event-hooks-webpack-plugin": "^2.1.1",
"expose-loader": "^0.7.4", "expose-loader": "^0.7.4",
@@ -78,11 +78,11 @@
"stylelint": "^10.0.1", "stylelint": "^10.0.1",
"stylelint-config-standard": "^18.3.0", "stylelint-config-standard": "^18.3.0",
"stylelint-order": "^3.0.0", "stylelint-order": "^3.0.0",
"stylelint-scss": "^3.6.0", "stylelint-scss": "^3.6.1",
"uglifyjs-3-webpack-plugin": "^1.2.4", "uglifyjs-3-webpack-plugin": "^1.2.4",
"unfetch": "^3.0.0", "unfetch": "^3.0.0",
"webpack": "^4.30.0", "webpack": "^4.31.0",
"webpack-cli": "^3.3.1", "webpack-cli": "^3.3.2",
"webpack-manifest-plugin": "^2.0.4" "webpack-manifest-plugin": "^2.0.4"
}, },
"engines": { "engines": {