1
0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-12-18 10:25:58 +01:00

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

This commit is contained in:
squidfunk 2021-05-06 18:50:27 +02:00
commit 05fbf06c63
7 changed files with 13 additions and 10 deletions

View File

@ -91,18 +91,18 @@ configuring syntax highlighting of code blocks:
: :octicons-milestone-24: Default: `table` The Highlight extension provides : :octicons-milestone-24: Default: `table` The Highlight extension provides
three ways to add line numbers, all of which are supported by Material for three ways to add line numbers, all of which are supported by Material for
MkDocs. While `table` wraps a code block in a table, `inline` and MkDocs. While `table` wraps a code block in a table, `inline` and
`pymdownx.inline` render line numbers as part of the line itself: `pymdownx-inline` render line numbers as part of the line itself:
``` yaml ``` yaml
markdown_extensions: markdown_extensions:
- pymdownx.highlight: - pymdownx.highlight:
linenums_style: pymdownx.inline linenums_style: pymdownx-inline
``` ```
Note that `inline` will put line numbers next to the actual code, which Note that `inline` will put line numbers next to the actual code, which
means that they will be included when selecting text with the cursor or means that they will be included when selecting text with the cursor or
copying a code block to the clipboard. Thus, the usage of `table` or copying a code block to the clipboard. Thus, the usage of `table` or
`pymdownx.inline` is recommended. `pymdownx-inline` is recommended.
_Material for MkDocs doesn't provide official support for the other options of _Material for MkDocs doesn't provide official support for the other options of
this extension, so they may be supported but might yield unexpected results. this extension, so they may be supported but might yield unexpected results.

View File

@ -180,7 +180,7 @@
</div> </div>
</div> </div>
{% if "navigation.top" in features %} {% if "navigation.top" in features %}
<a href="#" class="md-top md-icon" data-md-component="top" data-md-state="hidden"> <a href="#" class="md-top md-icon" title="{{ lang.t('top.title') }}" data-md-component="top" data-md-state="hidden">
{% include ".icons/material/arrow-up.svg" %} {% include ".icons/material/arrow-up.svg" %}
</a> </a>
{% endif %} {% endif %}

View File

@ -33,5 +33,6 @@
"source.file.date.updated": "Last update", "source.file.date.updated": "Last update",
"source.file.date.created": "Created", "source.file.date.created": "Created",
"tabs.title": "Tabs", "tabs.title": "Tabs",
"toc.title": "Table of contents" "toc.title": "Table of contents",
"top.title": "Back to top"
}[key] }}{% endmacro %} }[key] }}{% endmacro %}

6
package-lock.json generated
View File

@ -1866,9 +1866,9 @@
} }
}, },
"esbuild": { "esbuild": {
"version": "0.11.17", "version": "0.11.18",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.17.tgz", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.18.tgz",
"integrity": "sha512-Yj+rQATpLLU36ymg0/laLXn9FUoiGUl7mDPUJ0toQ5nXKFrj/rmIEkQ34T1GeiV2cP2SrT0G0s7xiNuDcsIyBg==", "integrity": "sha512-KD7v4N9b5B8bxPUNn/3GA9r0HWo4nJk3iwjZ+2zG1ffg+r8ig+wqj7sW6zgI6Sn4/B2FnbzqWxcAokAGGM5zwQ==",
"dev": true "dev": true
}, },
"escalade": { "escalade": {

View File

@ -58,7 +58,7 @@
"autoprefixer": "^10.2.5", "autoprefixer": "^10.2.5",
"chokidar": "^3.5.1", "chokidar": "^3.5.1",
"cssnano": "^5.0.2", "cssnano": "^5.0.2",
"esbuild": "^0.11.17", "esbuild": "^0.11.18",
"eslint": "^7.25.0", "eslint": "^7.25.0",
"eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.22.1",

View File

@ -341,6 +341,7 @@
<a <a
href="#" href="#"
class="md-top md-icon" class="md-top md-icon"
title="{{ lang.t('top.title') }}"
data-md-component="top" data-md-component="top"
data-md-state="hidden" data-md-state="hidden"
> >

View File

@ -53,5 +53,6 @@
"source.file.date.updated": "Last update", "source.file.date.updated": "Last update",
"source.file.date.created": "Created", "source.file.date.created": "Created",
"tabs.title": "Tabs", "tabs.title": "Tabs",
"toc.title": "Table of contents" "toc.title": "Table of contents",
"top.title": "Back to top"
}[key] }}{% endmacro %} }[key] }}{% endmacro %}