OpenSourceArk/mkdocs-material
1
0
Fork 0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-06-14 11:52:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed miscalculated sidebar height

Browse Source
This commit is contained in:
squidfunk 2017-05-15 10:44:26 +02:00 committed by Martin Donath
parent 60a897152c
commit 58288f87ac
10 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
material/assets/javascripts/application-39dd7b3de1.js Normal file
View File

File diff suppressed because one or more lines are too long

3
material/assets/javascripts/application-6b599127bc.js
View File

File diff suppressed because one or more lines are too long

1
material/assets/javascripts/modernizr-50360da7ff.js Normal file
View File

File diff suppressed because one or more lines are too long

1
material/assets/javascripts/modernizr-56ade86843.js
View File

File diff suppressed because one or more lines are too long

1
material/assets/stylesheets/application-22142f0641.css Normal file
View File

File diff suppressed because one or more lines are too long

1
material/assets/stylesheets/application-4d0d3f2fbf.css
View File

File diff suppressed because one or more lines are too long

1
material/assets/stylesheets/application-b824172603.palette.css Normal file
View File

File diff suppressed because one or more lines are too long

1
material/assets/stylesheets/application-f78e5cb881.palette.css
View File

File diff suppressed because one or more lines are too long

8
material/base.html
View File

@ -35,12 +35,12 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block libs %} {% block libs %}
<script src="{{ base_url }}/assets/javascripts/modernizr-56ade86843.js"></script> <script src="{{ base_url }}/assets/javascripts/modernizr-50360da7ff.js"></script>
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-4d0d3f2fbf.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-22142f0641.css">
{% if config.extra.palette %} {% if config.extra.palette %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-f78e5cb881.palette.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-b824172603.palette.css">
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block fonts %} {% block fonts %}
@ -149,7 +149,7 @@
{% endblock %} {% endblock %}
</div> </div>
{% block scripts %} {% block scripts %}
<script src="{{ base_url }}/assets/javascripts/application-6b599127bc.js"></script> <script src="{{ base_url }}/assets/javascripts/application-39dd7b3de1.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>

10
src/assets/stylesheets/layout/_base.scss
View File

@ -33,7 +33,7 @@ $md-toggle__drawer--checked:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Stretch container to viewport and set base font-size to 10px for simple // Stretch container to viewport and set base font-size to 10px for simple
// calculations base on relative ems (rems). // calculations base on relative ems (rems)
html { html {
height: 100%; height: 100%;
font-size: 62.5%; font-size: 62.5%;
@ -49,7 +49,7 @@ html {
} }
} }
// Stretch body to container and leave room for footer. // Stretch body to container and leave room for footer
body { body {
position: relative; position: relative;
height: 100%; height: 100%;
@ -96,7 +96,7 @@ hr {
} }
// Content wrapper - use display: table to make variable-height sticky footers // Content wrapper - use display: table to make variable-height sticky footers
// work and fixed table-layout for IE, taken from http://bit.ly/2hZohXL // work and fixed table-layout for IE, see http://bit.ly/2hZohXL
.md-container { .md-container {
display: table; display: table;
width: 100%; width: 100%;
@ -114,6 +114,10 @@ hr {
&__inner { &__inner {
min-height: 100%; min-height: 100%;
padding-top: 2.4rem + 0.6rem; padding-top: 2.4rem + 0.6rem;
// Hack: induce margin-collapse, because otherwise the sidebar height is
// not calculated correctly and the overflow property on this element must
// be left in initial state for targetted link offsets to work properly
padding-bottom: 0.1rem;
} }
} }