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

Merge branch 'master' into chore/setup-gemini-test-environment

Browse Source
This commit is contained in:
squidfunk 2017-01-28 17:57:37 +01:00
commit 0eb24a04ae
7 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
material/assets/javascripts/application-2afe21e0b2.js → material/assets/javascripts/application-7f35cda7dd.js
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
material/assets/stylesheets/application-f3ab63f78a.css
View File

File diff suppressed because one or more lines are too long

4
material/base.html
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-f3ab63f78a.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-bc099a55ca.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 %}
@ -124,7 +124,7 @@
{% endblock %} {% endblock %}
</div> </div>
{% block scripts %} {% block scripts %}
<script src="{{ base_url }}/assets/javascripts/application-2afe21e0b2.js"></script> <script src="{{ base_url }}/assets/javascripts/application-7f35cda7dd.js"></script>
<script>var config={url:{base:"{{ base_url }}"}},app=new Application(config);app.initialize()</script> <script>var config={url:{base:"{{ base_url }}"}},app=new Application(config);app.initialize()</script>
{% for path in extra_javascript %} {% for path in extra_javascript %}
<script src="{{ path }}"></script> <script src="{{ path }}"></script>

2
package.json
View File

@ -84,7 +84,7 @@
"material-shadows": "^3.0.1", "material-shadows": "^3.0.1",
"mocha": "^3.2.0", "mocha": "^3.2.0",
"modularscale-sass": "^2.1.1", "modularscale-sass": "^2.1.1",
"node-notifier": "^4.6.1", "node-notifier": "^5.0.0",
"postcss-pseudo-classes": "^0.1.0", "postcss-pseudo-classes": "^0.1.0",
"selenium-standalone": "^5.9.1", "selenium-standalone": "^5.9.1",
"stylelint": "^7.7.1", "stylelint": "^7.7.1",

17
src/assets/stylesheets/extensions/_permalinks.scss
View File

@ -80,18 +80,23 @@
} }
} }
// Correct headline offset with padding due to margin layering
h1[id] {
padding-top: 0.8rem;
// Hide anchor for top-level heading, as it makes no sense // Hide anchor for top-level heading, as it makes no sense
h1[id] .headerlink { &.headerlink {
display: none; display: none;
} }
}
// Correct anchor offset for link blurring // Correct anchor offset for link blurring
@each $level, $delta in ( @each $level, $delta in (
h2: 0.2rem, h2: 0.4rem,
h3: 0.4rem, h3: 0.7rem,
h4: 0.6rem, h4: 0.8rem,
h5: 1rem, h5: 1.1rem,
h6: 1rem h6: 1.1rem
) { ) {
// Un-targeted anchor // Un-targeted anchor

16
src/assets/stylesheets/layout/_nav.scss
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