mirror of
https://github.com/squidfunk/mkdocs-material.git
synced 2024-11-12 01:50:52 +01:00
Merge branch 'master' into master
This commit is contained in:
commit
93223df6a2
@ -1,5 +1,5 @@
|
||||
{
|
||||
"extends": "stylelint-config-standard",
|
||||
"extends": "stylelint-config-recommended",
|
||||
"plugins": [
|
||||
"stylelint-order",
|
||||
"stylelint-scss"
|
||||
@ -25,6 +25,7 @@
|
||||
"font-family-name-quotes": "always-where-recommended",
|
||||
"font-weight-notation": "numeric",
|
||||
"function-url-quotes": "always",
|
||||
"no-descending-specificity": null,
|
||||
"no-unknown-animations": true,
|
||||
"order/order": [
|
||||
"custom-properties",
|
||||
|
File diff suppressed because one or more lines are too long
2
material/assets/stylesheets/application.bcabdff3.css
Normal file
2
material/assets/stylesheets/application.bcabdff3.css
Normal file
File diff suppressed because one or more lines are too long
@ -46,7 +46,7 @@
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block styles %}
|
||||
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application.7a4cdee3.css">
|
||||
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application.bcabdff3.css">
|
||||
{% if palette.primary or palette.accent %}
|
||||
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-palette.792431c1.css">
|
||||
{% endif %}
|
||||
|
@ -68,8 +68,8 @@
|
||||
"promise-polyfill": "^6.0.2",
|
||||
"sass-loader": "^6.0.6",
|
||||
"style-loader": "^0.19.0",
|
||||
"stylelint": "^8.0.0",
|
||||
"stylelint-config-standard": "^17.0.0",
|
||||
"stylelint": "^8.3.0",
|
||||
"stylelint-config-standard": "^18.0.0",
|
||||
"stylelint-order": "^0.8.0",
|
||||
"stylelint-scss": "^2.0.0",
|
||||
"uglify-js": "^3.1.10",
|
||||
|
@ -20,6 +20,8 @@
|
||||
/// DEALINGS
|
||||
////
|
||||
|
||||
// stylelint-disable font-family-no-missing-generic-family-keyword
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Rules
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -20,6 +20,8 @@
|
||||
/// DEALINGS
|
||||
////
|
||||
|
||||
// stylelint-disable no-duplicate-selectors
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Rules
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -39,13 +39,8 @@
|
||||
font-size: ms(-1);
|
||||
overflow: auto;
|
||||
|
||||
// Remove spacing on first element
|
||||
:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
// Adjust spacing on last element
|
||||
html & :last-child {
|
||||
html & > :last-child {
|
||||
margin-bottom: 1.2rem;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user