1
0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2025-01-31 03:43:46 +01:00

Merge branch 'refactor/rxjs-typescript' into feature/landing-page

This commit is contained in:
squidfunk 2020-04-04 17:47:16 +02:00
commit 20eefdf1de
17 changed files with 419 additions and 344 deletions

View File

@ -246,6 +246,14 @@ Note that all *top-level pages* (i.e. all top-level entries that directly refer
to an `*.md` file) defined inside the `nav` entry of `mkdocs.yml` will be
grouped under the first tab which will receive the title of the first page.
If you want to maintain absolute control over the navigation bar, you can opt
in to group all top-level pages under one entry (so all top-level entries have
subentries now). This way you can have nested navigation items in conjunction
with tabs, as nesting works as expected from the second level on when tabs are
enabled. Keep in mind that mobile navigation isn't affected by tabs, however,
which means that your top-level entries correspond to top-level mobile
navigation items.
### Language
> Default: `en`

View File

@ -1,10 +1,10 @@
{
"assets/javascripts/bundle.js": "assets/javascripts/bundle.d479f7c7.min.js",
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.d479f7c7.min.js.map",
"assets/javascripts/vendor.js": "assets/javascripts/vendor.c1fcc1cc.min.js",
"assets/javascripts/vendor.js.map": "assets/javascripts/vendor.c1fcc1cc.min.js.map",
"assets/javascripts/worker/search.js": "assets/javascripts/worker/search.3bc815f0.min.js",
"assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.3bc815f0.min.js.map",
"assets/stylesheets/main.css": "assets/stylesheets/main.dc5fa46b.min.css",
"assets/javascripts/bundle.js": "assets/javascripts/bundle.8d539fc7.min.js",
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.8d539fc7.min.js.map",
"assets/javascripts/vendor.js": "assets/javascripts/vendor.5b460a48.min.js",
"assets/javascripts/vendor.js.map": "assets/javascripts/vendor.5b460a48.min.js.map",
"assets/javascripts/worker/search.js": "assets/javascripts/worker/search.7f7c8775.min.js",
"assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.7f7c8775.min.js.map",
"assets/stylesheets/main.css": "assets/stylesheets/main.7584781b.min.css",
"assets/stylesheets/palette.css": "assets/stylesheets/palette.4444686e.min.css"
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -41,7 +41,7 @@
{% endif %}
{% endblock %}
{% block styles %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.dc5fa46b.min.css' | url }}">
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.7584781b.min.css' | url }}">
{% if palette.primary or palette.accent %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.4444686e.min.css' | url }}">
{% endif %}
@ -178,8 +178,8 @@
{% endblock %}
</div>
{% block scripts %}
<script src="{{ 'assets/javascripts/vendor.c1fcc1cc.min.js' | url }}"></script>
<script src="{{ 'assets/javascripts/bundle.d479f7c7.min.js' | url }}"></script>
<script src="{{ 'assets/javascripts/vendor.5b460a48.min.js' | url }}"></script>
<script src="{{ 'assets/javascripts/bundle.8d539fc7.min.js' | url }}"></script>
{%- set translations = {} -%}
{%- for key in [
"clipboard.copy",
@ -203,7 +203,7 @@
base: "{{ base_url }}",
features: {{ config.theme.features | tojson }},
search: Object.assign({
worker: "{{ 'assets/javascripts/worker/search.3bc815f0.min.js' | url }}"
worker: "{{ 'assets/javascripts/worker/search.7f7c8775.min.js' | url }}"
}, typeof search !== "undefined" && search)
})
</script>

View File

@ -47,7 +47,7 @@
{{ config.copyright }}
</div>
{% endif %}
made with
Made with
<a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener">
Material for MkDocs
</a>

694
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -53,7 +53,7 @@
"@types/resize-observer-browser": "^0.1.3",
"@types/webpack": "^4.41.7",
"@types/webpack-assets-manifest": "^3.0.0",
"autoprefixer": "^9.7.4",
"autoprefixer": "^9.7.5",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.4.2",
"css-mqpacker": "^7.0.0",
@ -87,7 +87,7 @@
"tslint": "^5.20.1",
"tslint-sonarts": "^1.9.0",
"typescript": "^3.8.3",
"webpack": "^4.42.0",
"webpack": "^4.42.1",
"webpack-assets-manifest": "^3.1.1",
"webpack-cli": "^3.3.11"
},

View File

@ -188,14 +188,9 @@ kbd {
box-shadow: none;
}
// Reset code if it's inside a link
// Ensure link color in code blocks
a > code {
margin: initial;
padding: initial;
color: initial;
background-color: transparent;
border-radius: initial;
box-shadow: none;
color: currentColor;
}
// Unformatted code blocks

View File

@ -143,10 +143,10 @@ $admonitions: (
}
// Reset code inside Admonition titles
> code {
code {
margin: initial;
padding: initial;
color: initial;
color: currentColor;
background-color: transparent;
border-radius: initial;
box-shadow: none;

View File

@ -91,7 +91,7 @@
{{ config.copyright }}
</div>
{% endif %}
made with
Made with
<a
href="https://squidfunk.github.io/mkdocs-material/"
target="_blank" rel="noopener"