squidfunk
/
mkdocs-material
mirror of https://github.com/squidfunk/mkdocs-material.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/material-v9

This commit is contained in:
squidfunk 2022-11-27 11:09:00 +01:00
parent bb5e561af7 87e313993e
commit b75c6494e6
14 changed files with 336 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/publishing-your-site.md
View File

@ -28,12 +28,14 @@ contents:
branches: branches:
- master # (2)! - master # (2)!
- main - main
permissions:
contents: write
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-python@v2 - uses: actions/setup-python@v4
with: with:
python-version: 3.x python-version: 3.x
- run: pip install mkdocs-material # (3)! - run: pip install mkdocs-material # (3)!
@ -64,13 +66,15 @@ contents:
branches: branches:
- master - master
- main - main
permissions:
contents: write
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.event.repository.fork == false if: github.event.repository.fork == false
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-python@v2 - uses: actions/setup-python@v4
with: with:
python-version: 3.x python-version: 3.x
- run: pip install git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git - run: pip install git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git
@ -122,15 +126,14 @@ contents:
image: python:latest image: python:latest
pages: pages:
stage: deploy stage: deploy
only:
- master # (1)!
- main
script: script:
- pip install mkdocs-material - pip install mkdocs-material
- mkdocs build --site-dir public - mkdocs build --site-dir public
artifacts: artifacts:
paths: paths:
- public - public
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
``` ```
1. At some point, GitLab renamed `master` to `main`. If your default branch 1. At some point, GitLab renamed `master` to `main`. If your default branch
@ -142,15 +145,14 @@ contents:
image: python:latest image: python:latest
pages: pages:
stage: deploy stage: deploy
only:
- master
- main
script: # (1)! script: # (1)!
- pip install git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git - pip install git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git
- mkdocs build --site-dir public - mkdocs build --site-dir public
artifacts: artifacts:
paths: paths:
- public - public
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
``` ```
1. Remember to set the `GH_TOKEN` environment variable to the value of your 1. Remember to set the `GH_TOKEN` environment variable to the value of your

6
docs/schema/assets/icons.json
View File

@ -9699,6 +9699,7 @@
"simple/adobepremierepro", "simple/adobepremierepro",
"simple/adobexd", "simple/adobexd",
"simple/adonisjs", "simple/adonisjs",
"simple/adp",
"simple/adyen", "simple/adyen",
"simple/aerlingus", "simple/aerlingus",
"simple/aeroflot", "simple/aeroflot",
@ -10376,6 +10377,7 @@
"simple/firefox", "simple/firefox",
"simple/firefoxbrowser", "simple/firefoxbrowser",
"simple/fireship", "simple/fireship",
"simple/firewalla",
"simple/first", "simple/first",
"simple/fitbit", "simple/fitbit",
"simple/fite", "simple/fite",
@ -10799,6 +10801,7 @@
"simple/kubernetes", "simple/kubernetes",
"simple/kubuntu", "simple/kubuntu",
"simple/kuma", "simple/kuma",
"simple/kuula",
"simple/kyocera", "simple/kyocera",
"simple/labview", "simple/labview",
"simple/lada", "simple/lada",
@ -11380,10 +11383,12 @@
"simple/reactquery", "simple/reactquery",
"simple/reactrouter", "simple/reactrouter",
"simple/reacttable", "simple/reacttable",
"simple/readme",
"simple/readthedocs", "simple/readthedocs",
"simple/realm", "simple/realm",
"simple/reason", "simple/reason",
"simple/reasonstudios", "simple/reasonstudios",
"simple/red",
"simple/redbubble", "simple/redbubble",
"simple/reddit", "simple/reddit",
"simple/redhat", "simple/redhat",
@ -11916,6 +11921,7 @@
"simple/w3c", "simple/w3c",
"simple/wacom", "simple/wacom",
"simple/wagtail", "simple/wagtail",
"simple/wails",
"simple/wakatime", "simple/wakatime",
"simple/walkman", "simple/walkman",
"simple/wallabag", "simple/wallabag",

2
docs/setup/setting-up-a-blog.md
View File

@ -215,6 +215,8 @@ The following configuration options are available for posts:
- `slug`: Replaced with a slug generated from the post's title. - `slug`: Replaced with a slug generated from the post's title.
- `file`: Replaced with the post's file name.
=== ":material-link: blog/2022/:material-dots-horizontal:/" === ":material-link: blog/2022/:material-dots-horizontal:/"
``` yaml ``` yaml

1
material/.icons/simple/adp.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.086 12a3.13 3.13 0 0 1-3.12 3.12h-1.2v-1.372h1.2a1.749 1.749 0 1 0 0-3.497h-1.2V8.88h1.2a3.13 3.13 0 0 1 3.12 3.12M8.434 8.88v2.537h-2.16l-.788 1.371h4.32V8.88ZM24 10.834a4.286 4.286 0 0 1-4.286 4.286v2.331h-3.702v-1.817a5.362 5.362 0 0 1-4.08 1.817H8.434V15.12H5.691L4.32 17.45H0L6.343 6.548h5.623a5.595 5.595 0 0 1 4.08 1.818V6.548h3.703A4.279 4.279 0 0 1 24 10.834M11.966 16.08a4.09 4.09 0 0 0 3.703-2.332h1.748v2.332h.96v-2.332h1.372a2.91 2.91 0 0 0 2.914-2.914 2.942 2.942 0 0 0-2.949-2.914h-2.331v3.497h-1.371a4.114 4.114 0 0 0-4.046-3.497h-4.8L2.4 16.08h1.131l1.372-2.332h4.903v2.332zm7.748-7.2h-1.371v1.371h1.371a.58.58 0 0 1 .583.583.6.6 0 0 1-.583.583h-1.371v1.371h1.371a1.954 1.954 0 0 0 1.955-1.954 1.975 1.975 0 0 0-1.955-1.954m1.92 7.886a.549.549 0 1 1-.548-.549.542.542 0 0 1 .548.549m.138 0a.686.686 0 1 0-.686.685.686.686 0 0 0 .686-.685m-.652-.309a.137.137 0 1 1 0 .274h-.137v-.274zm.172-.034a.26.26 0 0 0-.172-.069h-.274v.823h.103v-.308h.137l.171.308h.137l-.205-.343c.034 0 .068-.034.103-.068a.206.206 0 0 0 .034-.138.192.192 0 0 0-.034-.205"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
material/.icons/simple/firewalla.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12.156 0c-3.602 4.89.391 7.768 2.61 11.893-.751 1.527-1.745 3.08-2.733 4.836l-.072.025c-.849-.983-1.99-1.85-3.033-2.967 2.606-5.783-.809-9.812-.809-9.812a12.555 12.555 0 0 0-1.916 2.021c-2.296 3.06-2.027 5.897-2.027 5.897C4.176 19.07 12.125 24 12.125 24a21.738 21.738 0 0 0 2.139-1.594c5.864-4.974 5.564-10.513 5.564-10.513.122-4.308-1.622-5.905-4.82-9.014A83.864 83.864 0 0 1 12.156 0zm.281 17.37zm.397.687a4.298 4.298 0 0 1 .14.328 4.463 4.463 0 0 0-.14-.328zm.266.718a4.289 4.289 0 0 1 .14.791c.024.286.023.588-.006.91a5.23 5.23 0 0 0 .006-.91 4.513 4.513 0 0 0-.14-.79z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 652 B

1
material/.icons/simple/kuula.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 0C5.388 0 0 5.388 0 12s5.388 12 12 12 12-5.388 12-12S18.612 0 12 0Zm0 2.547A9.433 9.433 0 0 1 21.453 12 9.433 9.433 0 0 1 12 21.453 9.433 9.433 0 0 1 2.547 12 9.433 9.433 0 0 1 12 2.547Zm-.606 5.366 4.372-.693 2.01 3.944-3.13 3.13-3.944-2.01z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 324 B

1
material/.icons/simple/readme.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M22.011 3.269H16.19a4.29 4.29 0 0 0-4.185 3.345A4.29 4.29 0 0 0 7.819 3.27H2a2 2 0 0 0-2.001 2v10.244a2 2 0 0 0 2 2h3.738c4.257 0 5.53 1.025 6.138 3.134a.112.112 0 0 0 .112.084h.024a.112.112 0 0 0 .112-.084c.612-2.109 1.885-3.133 6.138-3.133h3.737a2 2 0 0 0 2.001-2V5.27a2 2 0 0 0-1.989-2ZM10.083 14.325a.144.144 0 0 1-.144.144H3.257a.144.144 0 0 1-.144-.144v-.953a.144.144 0 0 1 .144-.144H9.94a.144.144 0 0 1 .144.144zm0-2.537a.144.144 0 0 1-.144.144H3.257a.144.144 0 0 1-.144-.144v-.952a.144.144 0 0 1 .144-.144H9.94a.144.144 0 0 1 .144.144zm0-2.537a.144.144 0 0 1-.144.144H3.257a.144.144 0 0 1-.144-.144V8.3a.144.144 0 0 1 .144-.144H9.94a.144.144 0 0 1 .144.144zm10.804 5.07a.144.144 0 0 1-.144.144h-6.682a.144.144 0 0 1-.144-.144v-.953a.144.144 0 0 1 .144-.144h6.682a.144.144 0 0 1 .144.144zm0-2.537a.144.144 0 0 1-.144.144h-6.682a.144.144 0 0 1-.144-.144v-.952a.144.144 0 0 1 .144-.144h6.682a.144.144 0 0 1 .144.144zm0-2.537a.144.144 0 0 1-.144.144h-6.682a.144.144 0 0 1-.144-.144V8.3a.144.144 0 0 1 .144-.144h6.682a.144.144 0 0 1 .144.144v.952z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
material/.icons/simple/red.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 6.679V0L8.655 4.945Zm0 1.976v6.69l7.673-4L16.327 6.4zm0-1.976 3.345-1.734L12 0Zm8.655 6.133L12 17.322V24l12-6.242ZM12 24v-6.679l-8.655-4.509L0 17.758ZM4.327 11.345l7.673 4v-6.69L7.673 6.4Z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 270 B

1
material/.icons/simple/wails.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m19.67 5.252-7.856 5.039-.369-.459-8.69-.283 1.891 1.904 5.221.106 1.63 1.656-5.878.662 1.77 1.783 5.34-1.185.003-.006.993 1.168-3.079 3.11 7.399.001-1.582-5.002 2.209 3.14H24l-5.385-2.415h4.121l-5.384-2.418h4.117L16.297 9.73l1.088-1.443 4.09-1.076-3.467.248 1.662-2.207zm-3.635 2.322-6.039.43 1.455 1.826 1.813-.476 2.771-1.78zm-.252 2.84-.86 1.145-.001-.002.154-.205.707-.938zM0 12.2l5.615 1.033-1.017-1.027L0 12.2z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 495 B

2
material/.overrides/assets/javascripts/iconsearch_index.json
View File

File diff suppressed because one or more lines are too long

2
material/partials/javascripts/consent.html
View File

@ -1,4 +1,4 @@
{#- {#-
This file was automatically generated - do not edit This file was automatically generated - do not edit
-#} -#}
<script>var consent=__md_get("__consent");if(consent)for(var input of document.forms.consent.elements)input.name&&(input.checked=consent[input.name]||!1);else"file:"!==location.protocol&&setTimeout(function(){document.querySelector("[data-md-component=consent]").hidden=!1},250);var action,form=document.forms.consent;for(action of["submit","reset"])form.addEventListener(action,function(e){if(e.preventDefault(),"reset"===e.type)for(var n of document.forms.consent.elements)n.name&&(n.checked=!1);console.log(new FormData(form)),__md_set("__consent",Object.fromEntries(Array.from(new FormData(form).keys()).map(function(e){return[e,!0]}))),location.hash="",location.reload()})</script> <script>var consent=__md_get("__consent");if(consent)for(var input of document.forms.consent.elements)input.name&&(input.checked=consent[input.name]||!1);else"file:"!==location.protocol&&setTimeout(function(){document.querySelector("[data-md-component=consent]").hidden=!1},250);var action,form=document.forms.consent;for(action of["submit","reset"])form.addEventListener(action,function(e){if(e.preventDefault(),"reset"===e.type)for(var n of document.forms.consent.elements)n.name&&(n.checked=!1);__md_set("__consent",Object.fromEntries(Array.from(new FormData(form).keys()).map(function(e){return[e,!0]}))),location.hash="",location.reload()})</script>

602
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
package.json
View File

@ -63,16 +63,16 @@
"@types/node": "^18.11.9", "@types/node": "^18.11.9",
"@types/resize-observer-browser": "^0.1.7", "@types/resize-observer-browser": "^0.1.7",
"@types/sass": "^1.43.1", "@types/sass": "^1.43.1",
"@typescript-eslint/eslint-plugin": "^5.43.0", "@typescript-eslint/eslint-plugin": "^5.44.0",
"@typescript-eslint/parser": "^5.43.0", "@typescript-eslint/parser": "^5.44.0",
"autoprefixer": "^10.4.13", "autoprefixer": "^10.4.13",
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
"cssnano": "5.1.0", "cssnano": "5.1.0",
"esbuild": "^0.15.14", "esbuild": "^0.15.15",
"eslint": "^8.27.0", "eslint": "^8.28.0",
"eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsdoc": "^39.6.2", "eslint-plugin-jsdoc": "^39.6.4",
"eslint-plugin-no-null": "^1.0.2", "eslint-plugin-no-null": "^1.0.2",
"github-types": "^1.0.0", "github-types": "^1.0.0",
"gitlab": "^14.2.2", "gitlab": "^14.2.2",
@ -80,7 +80,7 @@
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"material-design-color": "^2.3.2", "material-design-color": "^2.3.2",
"material-shadows": "^3.0.1", "material-shadows": "^3.0.1",
"npm-check-updates": "^16.4.1", "npm-check-updates": "^16.4.3",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"postcss": "^8.4.19", "postcss": "^8.4.19",
"postcss-dir-pseudo-class": "^6.0.5", "postcss-dir-pseudo-class": "^6.0.5",
@ -90,7 +90,7 @@
"preact": "^10.11.3", "preact": "^10.11.3",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"sass": "^1.56.1", "sass": "^1.56.1",
"simple-icons": "^7.19.0", "simple-icons": "^7.21.0",
"stylelint": "^14.15.0", "stylelint": "^14.15.0",
"stylelint-config-rational-order": "^0.1.2", "stylelint-config-rational-order": "^0.1.2",
"stylelint-config-recommended": "^9.0.0", "stylelint-config-recommended": "^9.0.0",

1
src/partials/javascripts/consent.html
View File

@ -49,7 +49,6 @@
input.checked = false input.checked = false
/* Grab and serialize form data */ /* Grab and serialize form data */
console.log(new FormData(form))
__md_set("__consent", Object.fromEntries( __md_set("__consent", Object.fromEntries(
Array.from(new FormData(form).keys()) Array.from(new FormData(form).keys())
.map(function(key) { return [key, true] }) .map(function(key) { return [key, true] })