Skip to content

Commit 79c56f5

Browse files
authored
Merge pull request #3218 from squidfunk/feature/insiders-ghost-pepper
Material for MkDocs 8
2 parents 0544055 + 34e74b9 commit 79c56f5

File tree

281 files changed

+3162
-3214
lines changed

Some content is hidden

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

281 files changed

+3162
-3214
lines changed

.browserslistrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
last 4 years
1+
last 2 years

.editorconfig

+2-6
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ trim_trailing_whitespace = true
3434
[*.md]
3535
trim_trailing_whitespace = false
3636

37-
# Makefiles
37+
# Python
3838
[*.py]
39+
indent_style = space
3940
indent_size = 4
40-
41-
# Makefiles
42-
[Makefile]
43-
indent_style = tab
44-
indent_size = 8

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
*.tsbuildinfo
4444
.cache
4545
.eslintcache
46+
__pycache__
4647

4748
# -----------------------------------------------------------------------------
4849
# General

.stylelintrc

+10
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@
6262
"font-family-name-quotes": "always-where-recommended",
6363
"font-weight-notation": "numeric",
6464
"hue-degree-notation": "number",
65+
"length-zero-no-unit": [
66+
true,
67+
{
68+
"ignore": ["custom-properties"]
69+
}
70+
],
6571
"linebreaks": "unix",
6672
"media-feature-name-no-unknown": null,
6773
"no-descending-specificity": null,
@@ -80,6 +86,7 @@
8086
"selector-class-pattern": null,
8187
"selector-combinator-space-before": null,
8288
"selector-descendant-combinator-no-non-space": null,
89+
"selector-id-pattern": null,
8390
"selector-max-empty-lines": 0,
8491
"selector-max-id": 0,
8592
"selector-no-qualifying-type": null,
@@ -89,6 +96,7 @@
8996
"unicode-bom": "never",
9097
"unit-allowed-list": [
9198
"%",
99+
"ch",
92100
"dppx",
93101
"deg",
94102
"em",
@@ -141,6 +149,8 @@
141149
"scss/double-slash-comment-whitespace-inside": "always",
142150
"scss/at-extend-no-missing-placeholder": null,
143151
"scss/no-duplicate-mixins": true,
152+
"scss/no-global-function-names": null,
153+
"scss/operator-no-newline-after": null,
144154
"scss/operator-no-unspaced": true,
145155
"scss/partial-no-import": true,
146156
"scss/percent-placeholder-pattern": "^[a-z][a-z0-9]*(-[a-z0-9]+)*$",

docs/customization.md

+4-25
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,18 @@ assets may also be put in the `overrides` directory:
101101
├─ partials/
102102
│ ├─ integrations/ # Third-party integrations
103103
│ │ ├─ analytics/ # Analytics integrations
104-
│ │ ├─ analytics.html # Analytics setup
105-
│ │ └─ disqus.html # Disqus
104+
│ │ └─ analytics.html # Analytics setup
106105
│ ├─ languages/ # Translation languages
106+
│ ├─ content.html # Page content
107+
│ ├─ copyright.html # Copyright and theme information
107108
│ ├─ footer.html # Footer bar
108109
│ ├─ header.html # Header bar
109110
│ ├─ language.html # Translation setup
110111
│ ├─ logo.html # Logo in header and sidebar
111112
│ ├─ nav.html # Main navigation
112113
│ ├─ nav-item.html # Main navigation item
113114
│ ├─ palette.html # Color palette
114-
│ ├─ search.html # Search box
115+
│ ├─ search.html # Search interface
115116
│ ├─ social.html # Social links
116117
│ ├─ source.html # Repository information
117118
│ ├─ source-file.html # Source file information
@@ -192,28 +193,6 @@ The following template blocks are provided by the theme:
192193
| `styles` | Wraps the style sheets (also extra sources) |
193194
| `tabs` | Wraps the tabs navigation (if available) |
194195

195-
#### Additional variables
196-
197-
Besides template blocks, Material for MkDocs provides extra variables for parts
198-
that cannot be overridden with template blocks (due to technical limitations of
199-
the template engine). If you want to add further information after the _Made
200-
with Material for MkDocs_ hint in the footer, add the following line to
201-
`main.html`:
202-
203-
``` html
204-
{% extends "base.html" %}
205-
206-
{% set extracopyright %}
207-
<!-- Add additional copyright information here -->
208-
{% endset %}
209-
```
210-
211-
The following template variables are provided by the theme:
212-
213-
| Block name | Purpose |
214-
|:------------------|:------------------------------------------------|
215-
| `extracopyright` | Adds custom copyright information |
216-
217196
## Theme development
218197

219198
Material for MkDocs is built on top of [TypeScript], [RxJS] and [SASS], and

docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If not, we recommended using [`docker`][docker].
1616

1717
## Installation
1818

19-
!!! danger "8.0.0 Beta 1 is out!"
19+
!!! danger "8.0.0 Beta 2 is out!"
2020

2121
Help test the latest version of Material for MkDocs, introducing many new
2222
features and improvements like [code annotations], [anchor tracking] and

docs/insiders/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ that new features are first exclusively released to sponsors as part of
1717
</div>
1818
<figcaption markdown>
1919

20-
The official documentation is built with Insiders
20+
This documentation is built with Insiders
2121
[squidfunk.github.io/mkdocs-material][Material for MkDocs]
2222

2323
</figcaption>

docs/publishing-your-site.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ Now, when a new commit is pushed to either the `master` or `main` branches,
9191
the static site is automatically built and deployed. Push your changes to see
9292
the workflow in action.
9393

94-
If the GitHub Page doesn't show up after a few minutes, ensure the source branch
95-
for your GitHub Page is set to `gh-pages` in your repository settings
96-
`github.com/<username>/<repository>/settings/pages`.
94+
If the GitHub Page doesn't show up after a few minutes, go to your
95+
settings of your repository and ensure that the [publishing source branch]
96+
for your GitHub Page is set to `gh-pages`.
9797

9898
Your documentation should shortly appear at `<username>.github.io/<repository>`.
9999

@@ -102,6 +102,7 @@ Your documentation should shortly appear at `<username>.github.io/<repository>`.
102102
[personal access token]: https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token
103103
[Insiders]: insiders/index.md
104104
[GitHub secrets]: https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets
105+
[publishing source branch]: https://docs.github.com/en/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site
105106

106107
### with MkDocs
107108

docs/reference/admonitions.md

+2-9
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ only the `inline` modifier.
287287

288288
Use `inline` to align to the left (right for rtl languages).
289289

290-
__Important__: Admonitions that use the `inline` modifiers _must_ be declared
290+
__Important__: admonitions that use the `inline` modifiers _must_ be declared
291291
prior to the content block you want to place them beside. If there's
292292
insufficient space to render the admonition next to the block, the admonition
293293
will stretch to the full width of the viewport, e.g. on mobile viewports.
@@ -299,7 +299,7 @@ will stretch to the full width of the viewport, e.g. on mobile viewports.
299299
Following is a list of type qualifiers provided by Material for MkDocs, whereas
300300
the default type, and thus fallback for unknown type qualifiers, is `note`:
301301

302-
`note`{ #type-note }, ~~`seealso`~~ [^1]
302+
`note`{ #type-note }
303303

304304
: !!! note
305305

@@ -395,13 +395,6 @@ the default type, and thus fallback for unknown type qualifiers, is `note`:
395395
euismod nulla. Curabitur feugiat, tortor non consequat finibus, justo
396396
purus auctor massa, nec semper lorem quam in massa.
397397

398-
[^1]:
399-
The `seealso` qualifier was originally adapted from the `readthedocs` theme,
400-
in order to make it easier for authors to migrate to Material for MkDocs.
401-
However, when the title is omitted, the admonition extension will render it
402-
as `Seealso`, which is incorrect English. For this reason, it was deprecated
403-
in :octicons-tag-24: 7.1.5 and will be removed in :octicons-tag-24: 8.0.0.
404-
405398
## Customization
406399

407400
### Custom admonitions

docs/reference/code-blocks.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ shortcode for a given language.
9090
_Example_:
9191

9292
```` markdown
93-
``` python
93+
``` py
9494
import tensorflow as tf
9595
```
9696
````
9797

9898
_Result_:
9999

100-
``` python
100+
``` py
101101
import tensorflow as tf
102102
```
103103

@@ -183,7 +183,7 @@ allows to split large code blocks for readability.
183183
_Example_:
184184

185185
```` markdown
186-
``` python linenums="1"
186+
``` py linenums="1"
187187
def bubble_sort(items):
188188
for i in range(len(items)):
189189
for j in range(len(items) - 1 - i):
@@ -194,7 +194,7 @@ def bubble_sort(items):
194194

195195
_Result_:
196196

197-
``` python linenums="1"
197+
``` py linenums="1"
198198
def bubble_sort(items):
199199
for i in range(len(items)):
200200
for j in range(len(items) - 1 - i):
@@ -214,7 +214,7 @@ at `1`, regardless of the starting line number specified as part of
214214
_Example_:
215215

216216
```` markdown
217-
``` python hl_lines="2 3"
217+
``` py hl_lines="2 3"
218218
def bubble_sort(items):
219219
for i in range(len(items)):
220220
for j in range(len(items) - 1 - i):
@@ -225,7 +225,7 @@ at `1`, regardless of the starting line number specified as part of
225225

226226
_Result_:
227227

228-
``` python linenums="1" hl_lines="2 3"
228+
``` py linenums="1" hl_lines="2 3"
229229
def bubble_sort(items):
230230
for i in range(len(items)):
231231
for j in range(len(items) - 1 - i):
@@ -238,7 +238,7 @@ at `1`, regardless of the starting line number specified as part of
238238
_Example_:
239239

240240
```` markdown
241-
``` python hl_lines="2-5"
241+
``` py hl_lines="2-5"
242242
def bubble_sort(items):
243243
for i in range(len(items)):
244244
for j in range(len(items) - 1 - i):
@@ -249,7 +249,7 @@ at `1`, regardless of the starting line number specified as part of
249249

250250
_Result_:
251251

252-
``` python linenums="1" hl_lines="2-5"
252+
``` py linenums="1" hl_lines="2-5"
253253
def bubble_sort(items):
254254
for i in range(len(items)):
255255
for j in range(len(items) - 1 - i):

docs/reference/meta-tags.md

+1-26
Original file line numberDiff line numberDiff line change
@@ -72,32 +72,6 @@ description: Nullam urna elit, malesuada eget finibus ut, ac tortor.
7272
This will set the `meta` tag containing the site description inside the
7373
document `head` for the current page to the provided value.
7474

75-
<div class="mdx-deprecated" markdown>
76-
77-
### Adding a web app manifest
78-
79-
[:octicons-tag-24: 3.1.0][manifest support] ·
80-
:octicons-archive-24: Deprecated ·
81-
:octicons-trash-24: 8.0.0
82-
83-
A [web app manifest] is a simple JSON file that specifies how your web
84-
application should behave when installed on the user's mobile device or desktop,
85-
which can be set via `mkdocs.yml`:
86-
87-
``` yaml
88-
extra:
89-
manifest: manifest.webmanifest # (1)
90-
```
91-
92-
1. This option was deprecated, as it's not widely used and the same behavior
93-
can be achieved with [theme extension].
94-
95-
[web app manifest]: https://web.dev/add-manifest/
96-
[manifest support]: https://github.com/squidfunk/mkdocs-material/releases/tag/3.1.0
97-
[theme extension]: ../customization.md#extending-the-theme
98-
99-
</div>
100-
10175
## Customization
10276

10377
### Using metadata in templates
@@ -116,6 +90,7 @@ e.g. to add indexing policies for search engines via the `robots` property:
11690
{% endblock %}
11791
```
11892

93+
[theme extension]: ../customization.md#extending-the-theme
11994
[overriding blocks]: ../customization.md#overriding-blocks
12095

12196
#### on a single page

0 commit comments

Comments
 (0)