Merge branch 'master' of github.com:squidfunk/mkdocs-material into refactor/sidebar-height-spacing

This commit is contained in:
squidfunk 2017-01-26 21:33:49 +01:00
commit e9af74f3df
4 changed files with 10 additions and 10 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -45,7 +45,7 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-9b2df9daf6.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-d970c8bd45.css">
{% if config.extra.palette %} {% if config.extra.palette %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-02ce7adcc2.palette.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-02ce7adcc2.palette.css">
{% endif %} {% endif %}

View File

@ -26,7 +26,7 @@
// Navigation container // Navigation container
.md-nav { .md-nav {
font-size: ms(-1); font-size: 1.4rem;
line-height: 1.3; line-height: 1.3;
// Table of contents // Table of contents
@ -178,6 +178,13 @@
background-color: $md-color-white; background-color: $md-color-white;
} }
// List title and item
.md-nav__title,
.md-nav__item {
font-size: 1.6rem;
line-height: 1.5;
}
// List title - higher specificity is necessary to ensure that the title // List title - higher specificity is necessary to ensure that the title
// inside the drawer is always styled accordingly // inside the drawer is always styled accordingly
html & .md-nav__title { html & .md-nav__title {
@ -354,13 +361,6 @@
opacity: 1; opacity: 1;
} }
} }
// List item
.md-nav__title,
.md-nav__item {
font-size: 1.6rem;
line-height: 1.5;
}
} }
// [tablet portrait -]: Show table of contents in drawer // [tablet portrait -]: Show table of contents in drawer