1
0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2025-02-06 14:14:23 +01:00

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

This commit is contained in:
squidfunk 2018-06-18 10:12:00 +02:00
commit d6295e1385
4 changed files with 11 additions and 6 deletions

View File

@ -48,7 +48,7 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application.4f4f49e8.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application.ba0fd1a6.css">
{% if palette.primary or palette.accent %} {% if palette.primary or palette.accent %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-palette.6079476c.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-palette.6079476c.css">
{% endif %} {% endif %}
@ -175,7 +175,7 @@
{% endblock %} {% endblock %}
</div> </div>
{% block scripts %} {% block scripts %}
<script src="{{ base_url }}/assets/javascripts/application.d0060b13.js"></script> <script src="{{ base_url }}/assets/javascripts/application.ef380b89.js"></script>
{% if lang.t("search.language") != "en" %} {% if lang.t("search.language") != "en" %}
{% set languages = lang.t("search.language").split(",") %} {% set languages = lang.t("search.language").split(",") %}
{% if languages | length and languages[0] != "" %} {% if languages | length and languages[0] != "" %}

View File

@ -359,9 +359,14 @@ $codehilite-whitespace: transparent;
} }
} }
// When pymdownx.superfences is enabled but codehilite is disabled, the // When pymdownx.superfences is enabled but codehilite is disabled,
// outer container gets this class name by default. // pymdownx.highlight will be used. When this happens, the outer
// container and tables get these class names by default.
.highlight { .highlight {
@extend .codehilite; @extend .codehilite;
} }
.highlighttable {
@extend .codehilitetable;
}
} }