Skip to content

Commit bc74a24

Browse files
authored
Merge branch 'master' into master
2 parents 30d844c + 1410254 commit bc74a24

File tree

4,537 files changed

+12130
-3913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,537 files changed

+12130
-3913
lines changed
Loading
10.4 KB
Loading

.github/workflows/documentation.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@ jobs:
5757
run: |
5858
pip install .
5959
pip install \
60+
"cairosvg>=2.5" \
6061
"mkdocs-git-committers-plugin-2>=1.1.1" \
6162
"mkdocs-git-revision-date-localized-plugin>=1.0" \
6263
"mkdocs-minify-plugin>=0.3" \
63-
"mkdocs-redirects>=1.0"
64+
"mkdocs-rss-plugin>=1.1" \
65+
"mkdocs-redirects>=1.0" \
66+
"pillow<10"
6467
6568
- name: Install Insiders build
6669
if: github.event.repository.fork == false

.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
python-version: ${{ env.PYTHON_VERSION }}
4747

4848
- name: Set up Python dependencies
49-
run: pip install --upgrade setuptools wheel twine
49+
run: pip install --upgrade build twine
5050

5151
- name: Build Python package
52-
run: python setup.py build sdist bdist_wheel --universal
52+
run: python -m build
5353

5454
- name: Publish Python package
5555
env:

CHANGELOG

+65
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,68 @@
1+
mkdocs-material-8.5.2+insiders-4.23.5 (2022-09-18)
2+
3+
* Fixed #4367: Improved blog plugin date handling for MultiMarkdown syntax
4+
* Fixed #4374: Fixed invalid URLs of related links to other blog posts
5+
6+
mkdocs-material-8.5.2 (2022-09-18)
7+
8+
* Updated Mermaid.js to version 9.1.7
9+
* Fixed overly large headlines in search results (8.5.0 regression)
10+
* Fixed #4358: Navigation sections appear as clickable (8.5.0 regression)
11+
* Fixed #4356: GitHub repository statistics fetched before consent
12+
13+
mkdocs-material-8.5.1 (2022-09-15)
14+
15+
* Fixed #4366: Removed dependencies with native extensions
16+
17+
mkdocs-material-8.5.0+insiders-4.23.4 (2022-09-14)
18+
19+
* Fixed #4365: Recursion error in blog plugin due to deepcopy
20+
* Fixed path errors for blog plugin on Windows
21+
* Fixed publishing workflow in forked repositories
22+
23+
mkdocs-material-8.5.0+insiders-4.23.3 (2022-09-13)
24+
25+
* Fixed previous and next page links for drafts of blog posts
26+
27+
mkdocs-material-8.5.0 (2022-09-13)
28+
29+
* Added support for social cards
30+
* Added support for code annotation anchor links (deep linking)
31+
* Added support for code annotation comment stripping (syntax modifier)
32+
* Added support for sidebars scrolling automatically to active item
33+
* Added support for anchor following table of contents (= auto scroll)
34+
* Added support for tag icons
35+
36+
mkdocs-material-8.4.4+insiders-4.23.2 (2022-09-13)
37+
38+
* Fixed #4348: Blog plugin crashes on custom nav title
39+
* Fixed blog plugin crashing when category contained only drafts
40+
* Fixed rendering of content from blog index file
41+
42+
mkdocs-material-8.4.4+insiders-4.23.1 (2022-09-12)
43+
44+
* Fixed #4345: Blog plugin errors with default settings
45+
46+
mkdocs-material-8.4.4+insiders-4.23.0 (2022-09-12)
47+
48+
* Added blogging support via built-in blog plugin
49+
50+
mkdocs-material-8.4.4 (2022-09-12)
51+
52+
* Moved comments integration to separate partial (comments.html)
53+
54+
mkdocs-material-8.4.3+insiders-4.22.1 (2022-09-07)
55+
56+
* Fixed #4217: Tooltips in data tables render in wrong position
57+
58+
mkdocs-material-8.4.3 (2022-09-07)
59+
60+
* Added Simple Icons to bundled icons (+2,300 icons)
61+
* Added support for changing edit icon
62+
* Moved page actions to separate partial (actions.html)
63+
* Fixed #4291: Version switching doesn't stay on page when anchors are used
64+
* Fixed #4327: Links in data tables do not receive link styling
65+
166
mkdocs-material-8.4.2 (2022-08-27)
267

368
* Updated Slovenian translations

CONTRIBUTING.md

+30
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,36 @@ it is:
4040
the `master`, as it's always a matter of opinion whether if benefits the
4141
overall functionality of the project.
4242

43+
### Missing translations?
44+
45+
Material for MkDocs ships support for 50+ languages with the help of community
46+
contributions. When new features are added, sometimes, new translations are
47+
necessary as well. It's impossible for the maintainers of the project to update
48+
all translations (we just don't speak 50+ languages), so we have to rely on
49+
our contributors to incrementally update translations. This process is pretty
50+
simple, so if you find a translation missing in your language, follow these
51+
guidelines:
52+
53+
1. Fork the repository.
54+
55+
2. Open up the [translation file for your language] as well as the
56+
[English translations], as they are always up-to-date. Compare them
57+
side-by-side and add the missing translations. __Important__: only add the
58+
translations that are different from the defaults, e.g. if your language
59+
is left-to-right, don't add the `direction` translation, as English is
60+
left-to-right as well. The following translations are for technical
61+
purposes, and should not be updated, so if they're missing from your
62+
language it's for good reason:
63+
64+
- `search.config.lang`
65+
- `search.config.pipeline`
66+
- `search.config.separator`
67+
68+
1. Create a PR (see below) with your changes.
69+
70+
[translation file for your language]: https://github.com/squidfunk/mkdocs-material/tree/master/src/partials/languages
71+
[English translations]: https://github.com/squidfunk/mkdocs-material/tree/master/src/partials/languages/en.html
72+
4373
## Submission guidelines
4474

4575
### Submitting an issue

Dockerfile

+9-3
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,37 @@ WORKDIR /tmp
3232

3333
# Copy files necessary for build
3434
COPY material material
35-
COPY MANIFEST.in MANIFEST.in
3635
COPY package.json package.json
3736
COPY README.md README.md
3837
COPY requirements.txt requirements.txt
39-
COPY setup.py setup.py
38+
COPY pyproject.toml pyproject.toml
4039

4140
# Perform build and cleanup artifacts and caches
4241
RUN \
4342
apk upgrade --update-cache -a \
4443
&& \
4544
apk add --no-cache \
45+
cairo \
46+
freetype-dev \
4647
git \
4748
git-fast-import \
49+
jpeg-dev \
4850
openssh \
51+
zlib-dev \
4952
&& \
5053
apk add --no-cache --virtual .build \
5154
gcc \
55+
libffi-dev \
5256
musl-dev \
5357
&& \
5458
pip install --no-cache-dir . \
5559
&& \
5660
if [ "${WITH_PLUGINS}" = "true" ]; then \
5761
pip install --no-cache-dir \
5862
"mkdocs-minify-plugin>=0.3" \
59-
"mkdocs-redirects>=1.0"; \
63+
"mkdocs-redirects>=1.0" \
64+
"pillow>=9.0" \
65+
"cairosvg>=2.5"; \
6066
fi \
6167
&& \
6268
apk del .build \

MANIFEST.in

-11
This file was deleted.

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
<a href="https://jitterbit.com/" target=_blank><img
126126
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-jitterbit.png" height="58"
127127
/></a>
128+
<a href="https://sparkfun.com/" target=_blank><img
129+
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-sparkfun.png" height="58"
130+
/></a>
131+
<a href="https://automationtechnology.de/" target=_blank><img
132+
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-automation-technology.png" height="58"
133+
/></a>
128134
</p>
129135
<p>&nbsp;</p>
130136

docs/alternatives.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ __Challenges__
2929
- More time needed to get up and running
3030

3131
While [Docusaurus] is one of the best choices when it comes to documentation
32-
sites that output a single page applications, there are many more solutions,
32+
sites that output a single page application, there are many more solutions,
3333
including [Docz], [Gatsby], [Vuepress] and [Docsify] that approach
3434
this problem similarily.
3535

docs/blog/.authors.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
squidfunk:
2+
name: Martin Donath
3+
description: Creator
4+
avatar: https://avatars.githubusercontent.com/u/932156

docs/blog/.meta.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
comments: true
2+
hide:
3+
- feedback

docs/blog/index.md

-145
Original file line numberDiff line numberDiff line change
@@ -1,146 +1 @@
1-
---
2-
template: overrides/main.html
3-
title: Blog
4-
search:
5-
exclude: true
6-
---
7-
8-
<style>
9-
.md-sidebar--secondary:not([hidden]) {
10-
visibility: hidden;
11-
}
12-
</style>
13-
141
# Blog
15-
16-
## [Chinese search support – 中文搜索​支持]
17-
18-
__Insiders adds experimental Chinese language support for the [built-in search
19-
plugin] – a feature that has been requested for a long time given the large
20-
number of Chinese users.__
21-
22-
<aside class="mdx-author" markdown>
23-
![@squidfunk][@squidfunk avatar]
24-
25-
<span>__Martin Donath__ · @squidfunk</span>
26-
<span>
27-
:octicons-calendar-24: May 5, 2022 ·
28-
:octicons-clock-24: 5 min read ·
29-
[:octicons-tag-24: 8.2.13+insiders-4.14.0][insiders-4.14.0]
30-
</span>
31-
</aside>
32-
33-
---
34-
35-
After the United States and Germany, the third-largest country of origin of
36-
Material for MkDocs users is China. For a long time, the [built-in search plugin]
37-
didn't allow for proper segmentation of Chinese characters, mainly due to
38-
missing support in [`lunr-languages`][lunr-languages] which is used for search
39-
tokenization and stemming. The latest Insiders release adds long-awaited Chinese
40-
language support for the built-in search plugin, something that has been
41-
requested by many users.
42-
43-
[:octicons-arrow-right-24: Continue reading][Chinese search support – 中文搜索​支持]
44-
45-
[built-in search plugin]: ../setup/setting-up-site-search.md#built-in-search-plugin
46-
[@squidfunk avatar]: https://avatars.githubusercontent.com/u/932156
47-
[insiders-4.14.0]: ../insiders/changelog.md#4.14.0
48-
[lunr-languages]: https://github.com/MihaiValentin/lunr-languages
49-
[Chinese search support – 中文搜索​支持]: 2022/chinese-search-support.md
50-
51-
## [The past, present and future]
52-
53-
__2021 was a fantastic year for this project as we shipped many new awesome
54-
features, saw significant user growth and leveraged GitHub Sponsors to make the
55-
project sustainable.__
56-
57-
<aside class="mdx-author" markdown>
58-
![@squidfunk][@squidfunk avatar]
59-
60-
<span>__Martin Donath__ · @squidfunk</span>
61-
<span>
62-
:octicons-calendar-24: December 27, 2021 ·
63-
:octicons-clock-24: 10 min read
64-
</span>
65-
</aside>
66-
67-
---
68-
69-
Today, together, MkDocs and Material for MkDocs are among the most popular
70-
options when it comes to choosing a static site generator and theme for your
71-
technical documentation project. Material for MkDocs ensures that your
72-
content is always perfectly presented to your audience, regardless of screen
73-
resolution or device capabilities. It has evolved to a framework for technical
74-
writing, offering many features, some of which are yet to be found in other
75-
static site generators. However, we're far from the end, as 2022 is going to
76-
bring some interesting new capabilities.
77-
78-
[:octicons-arrow-right-24: Continue reading][The past, present and future]
79-
80-
[The past, present and future]: 2021/the-past-present-and-future.md
81-
82-
## [Excluding content from search]
83-
84-
__The latest Insiders release brings three new simple ways to exclude dedicated
85-
parts of a document from the search index, allowing for more fine-grained
86-
control.__
87-
88-
<aside class="mdx-author" markdown>
89-
![@squidfunk][@squidfunk avatar]
90-
91-
<span>__Martin Donath__ · @squidfunk</span>
92-
<span>
93-
:octicons-calendar-24: September 26, 2021 ·
94-
:octicons-clock-24: 5 min read ·
95-
[:octicons-tag-24: 7.3.0+insiders-3.1.1][insiders-3.1.1]
96-
</span>
97-
</aside>
98-
99-
---
100-
101-
Two weeks ago, Material for MkDocs Insiders shipped a brand new search plugin,
102-
yielding massive improvements in usability, but also in speed and size of the
103-
search index. Interestingly, as discussed in the previous blog article, we only
104-
scratched the surface of what's now possible. This release brings some useful
105-
features that enhance the writing experience, allowing for more fine-grained
106-
control of what pages, sections and blocks of a Markdown file should be indexed
107-
by the built-in search functionality.
108-
109-
[:octicons-arrow-right-24: Continue reading][Excluding content from search]
110-
111-
[Excluding content from search]: 2021/excluding-content-from-search.md
112-
[insiders-3.1.1]: ../insiders/changelog.md#3.1.1
113-
114-
## [Search: better, faster, smaller]
115-
116-
__This is the story of how we managed to completely rebuild client-side search,
117-
delivering a significantly better user experience while making it faster and
118-
smaller at the same time.__
119-
120-
<aside class="mdx-author" markdown>
121-
![@squidfunk][@squidfunk avatar]
122-
123-
<span>__Martin Donath__ · @squidfunk</span>
124-
<span>
125-
:octicons-calendar-24: September 13, 2021 ·
126-
:octicons-clock-24: 15 min read ·
127-
[:octicons-tag-24: 7.2.6+insiders-3.0.0][insiders-3.0.0]
128-
</span>
129-
</aside>
130-
131-
---
132-
133-
The search of Material for MkDocs is by far one of its best and most-loved
134-
assets: multilingual, offline-capable, and most importantly: _all client-side_.
135-
It provides a solution to empower the users of your documentation to find what
136-
they're searching for instantly without the headache of managing additional
137-
servers. However, even though several iterations have been made, there's still
138-
some room for improvement, which is why we rebuilt the search plugin and
139-
integration from the ground up. This article shines some light on the internals
140-
of the new search, why it's much more powerful than the previous version, and
141-
what's about to come.
142-
143-
[:octicons-arrow-right-24: Continue reading][Search: better, faster, smaller]
144-
145-
[Search: better, faster, smaller]: 2021/search-better-faster-smaller.md
146-
[insiders-3.0.0]: ../insiders/changelog.md#3.0.0

0 commit comments

Comments
 (0)