Cool_Tools/mkdocs-material
1
0
Fork 0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-11-28 01:10:58 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Joshua Avalon 2017-12-13 09:11:45 +08:00 committed by GitHub
commit 93223df6a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.stylelintrc
View File

@ -1,5 +1,5 @@
{ {
"extends": "stylelint-config-standard", "extends": "stylelint-config-recommended",
"plugins": [ "plugins": [
"stylelint-order", "stylelint-order",
"stylelint-scss" "stylelint-scss"
@ -25,6 +25,7 @@
"font-family-name-quotes": "always-where-recommended", "font-family-name-quotes": "always-where-recommended",
"font-weight-notation": "numeric", "font-weight-notation": "numeric",
"function-url-quotes": "always", "function-url-quotes": "always",
"no-descending-specificity": null,
"no-unknown-animations": true, "no-unknown-animations": true,
"order/order": [ "order/order": [
"custom-properties", "custom-properties",

2
material/assets/stylesheets/application.7a4cdee3.css
View File

File diff suppressed because one or more lines are too long

2
material/assets/stylesheets/application.bcabdff3.css Normal file
View File

File diff suppressed because one or more lines are too long

2
material/base.html
View File

@ -46,7 +46,7 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block styles %} {% 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 %} {% if palette.primary or palette.accent %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-palette.792431c1.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-palette.792431c1.css">
{% endif %} {% endif %}

4
package.json
View File

@ -68,8 +68,8 @@
"promise-polyfill": "^6.0.2", "promise-polyfill": "^6.0.2",
"sass-loader": "^6.0.6", "sass-loader": "^6.0.6",
"style-loader": "^0.19.0", "style-loader": "^0.19.0",
"stylelint": "^8.0.0", "stylelint": "^8.3.0",
"stylelint-config-standard": "^17.0.0", "stylelint-config-standard": "^18.0.0",
"stylelint-order": "^0.8.0", "stylelint-order": "^0.8.0",
"stylelint-scss": "^2.0.0", "stylelint-scss": "^2.0.0",
"uglify-js": "^3.1.10", "uglify-js": "^3.1.10",

2
src/assets/stylesheets/base/_icons.scss
View File

@ -20,6 +20,8 @@
/// DEALINGS /// DEALINGS
//// ////
// stylelint-disable font-family-no-missing-generic-family-keyword
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Rules // Rules
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/assets/stylesheets/base/_reset.scss
View File

@ -20,6 +20,8 @@
/// DEALINGS /// DEALINGS
//// ////
// stylelint-disable no-duplicate-selectors
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Rules // Rules
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

7
src/assets/stylesheets/extensions/_admonition.scss
View File

@ -39,13 +39,8 @@
font-size: ms(-1); font-size: ms(-1);
overflow: auto; overflow: auto;
// Remove spacing on first element
:first-child {
margin-top: 0;
}
// Adjust spacing on last element // Adjust spacing on last element
html & :last-child { html & > :last-child {
margin-bottom: 1.2rem; margin-bottom: 1.2rem;
} }