mirror of
https://github.com/squidfunk/mkdocs-material.git
synced 2024-06-14 11:52:32 +03:00
Merge branch 'refactor/rxjs-typescript' into feature/landing-page
This commit is contained in:
commit
f0bfb7c022
@ -30,8 +30,8 @@ those packages separately.
|
||||
!!! tip "Installation in a virtual environment"
|
||||
|
||||
The best way to make sure that you end up with the correct versions and
|
||||
without any incompatibility problems between packages it to use a __virtual
|
||||
environment__. Don't know what this is or how to set it up? We recommend
|
||||
without any incompatibility problems between packages it to use a **virtual
|
||||
environment**. Don't know what this is or how to set it up? We recommend
|
||||
to start by reading a [tutorial on virtual environments][6] for Python.
|
||||
|
||||
!!! warning "Installation on macOS"
|
||||
@ -643,9 +643,9 @@ extra:
|
||||
|
||||
### Google Analytics
|
||||
|
||||
MkDocs makes it easy to integrate site tracking with Google Analytics. Besides
|
||||
basic page views, site search is tracked to better understand how people use
|
||||
your documentation. Google Analytics can be activated with:
|
||||
MkDocs makes it easy to integrate site tracking with Google Analytics. To enable
|
||||
tracking, which is disabled by default, you must add your tracking identifier
|
||||
to `mkdocs.yml`:
|
||||
|
||||
``` yaml
|
||||
google_analytics:
|
||||
@ -653,10 +653,20 @@ google_analytics:
|
||||
- auto
|
||||
```
|
||||
|
||||
Besides basic page views, *site search* can also be tracked to better understand
|
||||
how people use your documentation and what they expect to find. To enable
|
||||
search tracking:
|
||||
|
||||
1. Go to your Google Analytics **admin settings**
|
||||
2. Select the property for the respective tracking code
|
||||
3. Go to the **view settings** tab.
|
||||
4. Scroll down and enable **site search settings**
|
||||
5. Set the **query parameter** to `q`.
|
||||
|
||||
### Disqus
|
||||
|
||||
Material for MkDocs is integrated with [Disqus][24], so if you want to add a
|
||||
comments section to your documentation set the _shortname_ of your Disqus
|
||||
comments section to your documentation set the *shortname* of your Disqus
|
||||
project in `mkdocs.yml`:
|
||||
|
||||
``` yaml
|
||||
|
@ -127,7 +127,7 @@ pip show mkdocs-material
|
||||
* Added background on hover for table rows
|
||||
* Removed Google Tag Manager and reverted to Google Analytics
|
||||
* Removed blocks in partials - Jinja doesn't support them
|
||||
* Fixed #911: Chrome breaks layout if system language is Chinese (__BREAKING__)
|
||||
* Fixed #911: Chrome breaks layout if system language is Chinese (**BREAKING**)
|
||||
* Fixed #976: Removed FastClick
|
||||
|
||||
### 3.3.0 <small>_ January 29, 2019</small>
|
||||
@ -176,7 +176,7 @@ pip show mkdocs-material
|
||||
|
||||
### 3.0.0 <small>_ August 5, 2018</small>
|
||||
|
||||
* Upgraded MkDocs to 1.0 (__BREAKING__)
|
||||
* Upgraded MkDocs to 1.0 (**BREAKING**)
|
||||
* Upgraded Python in official Docker image to 3.6
|
||||
* Added Serbian and Serbo-Croatian translations
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,10 +1,10 @@
|
||||
{
|
||||
"assets/javascripts/bundle.js": "assets/javascripts/bundle.ed8df680.min.js",
|
||||
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.ed8df680.min.js.map",
|
||||
"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.c1451e9e.min.css",
|
||||
"assets/stylesheets/main.css": "assets/stylesheets/main.dc5fa46b.min.css",
|
||||
"assets/stylesheets/palette.css": "assets/stylesheets/palette.4444686e.min.css"
|
||||
}
|
File diff suppressed because one or more lines are too long
1
material/assets/stylesheets/main.dc5fa46b.min.css
vendored
Normal file
1
material/assets/stylesheets/main.dc5fa46b.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -41,7 +41,7 @@
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block styles %}
|
||||
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.c1451e9e.min.css' | url }}">
|
||||
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.dc5fa46b.min.css' | url }}">
|
||||
{% if palette.primary or palette.accent %}
|
||||
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.4444686e.min.css' | url }}">
|
||||
{% endif %}
|
||||
@ -179,7 +179,7 @@
|
||||
</div>
|
||||
{% block scripts %}
|
||||
<script src="{{ 'assets/javascripts/vendor.c1fcc1cc.min.js' | url }}"></script>
|
||||
<script src="{{ 'assets/javascripts/bundle.ed8df680.min.js' | url }}"></script>
|
||||
<script src="{{ 'assets/javascripts/bundle.d479f7c7.min.js' | url }}"></script>
|
||||
{%- set translations = {} -%}
|
||||
{%- for key in [
|
||||
"clipboard.copy",
|
||||
|
@ -58,8 +58,7 @@ kbd {
|
||||
.md-typeset {
|
||||
font-size: ms(0);
|
||||
line-height: 1.6;
|
||||
// Colors should be kept when printing
|
||||
-webkit-print-color-adjust: exact; // stylelint-disable-line
|
||||
color-adjust: exact;
|
||||
|
||||
// Default spacing
|
||||
p,
|
||||
|
@ -70,6 +70,7 @@
|
||||
summary {
|
||||
@extend .admonition-title;
|
||||
|
||||
display: block;
|
||||
min-height: px2rem(20px);
|
||||
padding: px2rem(8px) px2rem(36px) px2rem(8px) px2rem(40px);
|
||||
border-top-right-radius: px2rem(2px);
|
||||
|
@ -80,6 +80,12 @@ body {
|
||||
position: fixed;
|
||||
}
|
||||
}
|
||||
|
||||
// Hack: we must not use flex, or Firefox will only print the first page
|
||||
// see https://mzl.la/39DgR3m
|
||||
@media print {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
// Horizontal separators
|
||||
@ -102,6 +108,12 @@ hr {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-grow: 1;
|
||||
|
||||
// Hack: we must not use flex, or Firefox will only print the first page
|
||||
// see https://mzl.la/39DgR3m
|
||||
@media print {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
// The main content should stretch to maximum height in the table
|
||||
|
Loading…
Reference in New Issue
Block a user