Merge branch 'master' into fix/search-missing-results

This commit is contained in:
squidfunk 2017-04-08 18:52:28 +02:00
commit 49ac0e2111
7 changed files with 7 additions and 13 deletions

View File

@ -1,9 +1,8 @@
.github/* .github/*
docs/*
material/* material/*
.editorconfig .editorconfig
.gitignore .gitignore
.travisignore
CHANGELOG CHANGELOG
LICENSE LICENSE
*.md *.md
git

View File

@ -78,4 +78,4 @@ go ahead.
After your PR is merged, you can safely delete your branch and pull the changes After your PR is merged, you can safely delete your branch and pull the changes
from the main (upstream) repository. from the main (upstream) repository.
[4]: http://localhost:8000/customization/#theme-development [4]: http://squidfunk.github.io/mkdocs-material/customization/#theme-development

View File

@ -78,4 +78,4 @@ go ahead.
After your PR is merged, you can safely delete your branch and pull the changes After your PR is merged, you can safely delete your branch and pull the changes
from the main (upstream) repository. from the main (upstream) repository.
[4]: http://localhost:8000/customization/#theme-development [4]: http://squidfunk.github.io/mkdocs-material/customization/#theme-development

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -150,7 +150,7 @@
{% endblock %} {% endblock %}
</div> </div>
{% block scripts %} {% block scripts %}
<script src="{{ base_url }}/assets/javascripts/application-ff7132a167.js"></script> <script src="{{ base_url }}/assets/javascripts/application-0b7df094bf.js"></script>
<script>app.initialize({url:{base:"{{ base_url }}"}})</script> <script>app.initialize({url:{base:"{{ base_url }}"}})</script>
{% for path in extra_javascript %} {% for path in extra_javascript %}
<script src="{{ path }}"></script> <script src="{{ path }}"></script>

View File

@ -154,11 +154,6 @@ function initialize(config) { // eslint-disable-line func-style
}) })
})).listen() })).listen()
/* Listener: prevent touches on overlay if navigation is active */
new Material.Event.MatchMedia("(max-width: 1219px)",
new Material.Event.Listener("[data-md-component=overlay]", "touchstart",
ev => ev.preventDefault()))
/* Listener: close drawer when anchor links are clicked */ /* Listener: close drawer when anchor links are clicked */
new Material.Event.MatchMedia("(max-width: 959px)", new Material.Event.MatchMedia("(max-width: 959px)",
new Material.Event.Listener("[data-md-component=navigation] [href^='#']", new Material.Event.Listener("[data-md-component=navigation] [href^='#']",