Skip to content

Commit d98243d

Browse files
squidfunksquidfunk
committed
Merge branch 'master' into chore/update-to-mkdocs-1.6
2 parents 8b8cd3b + 374bbab commit d98243d

File tree

18 files changed

+46
-85
lines changed

18 files changed

+46
-85
lines changed

‎CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ and brings value to both new and experienced users of Material for MkDocs.
5353
__Want to create a pull request?__ Learn how to create a comprehensive
5454
and useful pull request (PR)s
5555

56-
[Report a bug]: reporting-a-bug.md
57-
[Report a docs issue]: reporting-a-docs-issue.md
58-
[Request a change]: requesting-a-change.md
56+
[Report a bug]: docs/contributing/reporting-a-bug.md
57+
[Report a docs issue]: docs/contributing/reporting-a-docs-issue.md
58+
[Request a change]: docs/contributing/requesting-a-change.md
5959
[Ask a question]: https://github.com/squidfunk/mkdocs-material/discussions
60-
[Add translations]: https://github.com/squidfunk/mkdocs-material/adding-translations
60+
[Add a translation]: docs/contributing/adding-translations
6161
[Create a pull request]: https://github.com/squidfunk/mkdocs-material/pulls

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1919
# IN THE SOFTWARE.
2020

21-
FROM python:3.11-alpine3.18
21+
FROM python:3.11-alpine3.19
2222

2323
# Build-time flags
2424
ARG WITH_PLUGINS=true

‎docs/contributing/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ In this section, we guide your through our processes.
113113
[report a bug]: reporting-a-bug.md
114114
[report a docs issue]: reporting-a-docs-issue.md
115115
[request a change]: requesting-a-change.md
116-
[add translations]: https://github.com/squidfunk/mkdocs-material/adding-translations
116+
[add translations]: adding-translations.md
117117
[create a pull request]: making-a-pull-request.md
118118

119119
## Checklist

‎docs/reference/formatting.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ syntax, which is more convenient that directly using the corresponding
8383
[`mark`][mark], [`ins`][ins] and [`del`][del] HTML tags:
8484

8585
``` title="Text with highlighting"
86-
- ==This was marked==
87-
- ^^This was inserted^^
88-
- ~~This was deleted~~
86+
- ==This was marked (highlight)==
87+
- ^^This was inserted (underline)^^
88+
- ~~This was deleted (strikethrough)~~
8989
```
9090

9191
<div class="result" markdown>
9292

93-
- ==This was marked==
94-
- ^^This was inserted^^
95-
- ~~This was deleted~~
93+
- ==This was marked (highlight)==
94+
- ^^This was inserted (underline)^^
95+
- ~~This was deleted (strikethrough)~~
9696

9797
</div>
9898

‎docs/schema/assets/icons.json

+4
Original file line numberDiff line numberDiff line change
@@ -11492,6 +11492,7 @@
1149211492
"simple/jsfiddle",
1149311493
"simple/json",
1149411494
"simple/jsonwebtokens",
11495+
"simple/jsr",
1149511496
"simple/jss",
1149611497
"simple/juce",
1149711498
"simple/juejin",
@@ -12236,6 +12237,7 @@
1223612237
"simple/progate",
1223712238
"simple/progress",
1223812239
"simple/prometheus",
12240+
"simple/pronounsdotpage",
1223912241
"simple/prosieben",
1224012242
"simple/proteus",
1224112243
"simple/protocolsdotio",
@@ -12485,6 +12487,7 @@
1248512487
"simple/scania",
1248612488
"simple/schneiderelectric",
1248712489
"simple/scikitlearn",
12490+
"simple/scilab",
1248812491
"simple/scipy",
1248912492
"simple/scopus",
1249012493
"simple/scpfoundation",
@@ -12724,6 +12727,7 @@
1272412727
"simple/subversion",
1272512728
"simple/suckless",
1272612729
"simple/sumologic",
12730+
"simple/sunrise",
1272712731
"simple/supabase",
1272812732
"simple/supercrease",
1272912733
"simple/supermicro",

‎material/overrides/assets/javascripts/iconsearch_index.json

+1-1
Large diffs are not rendered by default.

‎material/plugins/tags/plugin.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,10 @@ def on_page_markdown(self, markdown, page, config, files):
9797
return self._render_tag_index(markdown)
9898

9999
# Add page to tags index
100-
for tag in page.meta.get("tags", []):
101-
self.tags[tag].append(page)
100+
tags = page.meta.get("tags", [])
101+
if tags:
102+
for tag in tags:
103+
self.tags[tag].append(page)
102104

103105
# Inject tags into page (after search and before minification)
104106
def on_page_context(self, context, page, config, nav):
@@ -110,7 +112,8 @@ def on_page_context(self, context, page, config, nav):
110112
return
111113

112114
# Provide tags for page
113-
if "tags" in page.meta:
115+
context["tags"] =[]
116+
if "tags" in page.meta and page.meta["tags"]:
114117
context["tags"] = [
115118
self._render_tag(tag)
116119
for tag in page.meta["tags"]

‎material/templates/.icons/simple/alltrails.svg

+1-1
Loading

‎material/templates/.icons/simple/jsr.svg

+1
Loading

‎material/templates/.icons/simple/pronounsdotpage.svg

+1
Loading

‎material/templates/.icons/simple/scilab.svg

+1
Loading

‎material/templates/.icons/simple/sunrise.svg

+1
Loading

‎material/templates/partials/languages/ja.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"meta.comments": "コメント",
2828
"meta.source": "ソース",
2929
"nav": "ナビゲーション",
30-
"readtime.one": "このページは約１分で読めます",
31-
"readtime.other": "このページは約＃分で読めます",
30+
"readtime.one": "このページは約1分で読めます",
31+
"readtime.other": "このページは約#分で読めます",
3232
"rss.created": "新しいページのRSSフィード",
3333
"rss.updated": "更新されたページのRSSフィード",
3434
"search": "検索",

‎package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"preact": "^10.20.2",
8787
"rimraf": "^5.0.5",
8888
"sass": "^1.75.0",
89-
"simple-icons": "^11.12.0",
89+
"simple-icons": "^11.13.0",
9090
"stylelint": "^15.11.0",
9191
"stylelint-config-recess-order": "4.2.0",
9292
"stylelint-config-recommended": "^13.0.0",

‎setup.py

-53
This file was deleted.

‎src/plugins/tags/plugin.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,10 @@ def on_page_markdown(self, markdown, page, config, files):
9797
return self._render_tag_index(markdown)
9898

9999
# Add page to tags index
100-
for tag in page.meta.get("tags", []):
101-
self.tags[tag].append(page)
100+
tags = page.meta.get("tags", [])
101+
if tags:
102+
for tag in tags:
103+
self.tags[tag].append(page)
102104

103105
# Inject tags into page (after search and before minification)
104106
def on_page_context(self, context, page, config, nav):
@@ -110,7 +112,8 @@ def on_page_context(self, context, page, config, nav):
110112
return
111113

112114
# Provide tags for page
113-
if "tags" in page.meta:
115+
context["tags"] =[]
116+
if "tags" in page.meta and page.meta["tags"]:
114117
context["tags"] = [
115118
self._render_tag(tag)
116119
for tag in page.meta["tags"]

‎src/templates/partials/languages/ja.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"meta.comments": "コメント",
4848
"meta.source": "ソース",
4949
"nav": "ナビゲーション",
50-
"readtime.one": "このページは約１分で読めます",
51-
"readtime.other": "このページは約＃分で読めます",
50+
"readtime.one": "このページは約1分で読めます",
51+
"readtime.other": "このページは約#分で読めます",
5252
"rss.created": "新しいページのRSSフィード",
5353
"rss.updated": "更新されたページのRSSフィード",
5454
"search": "検索",

0 commit comments

Comments
 (0)