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

Updated resets

Browse Source
This commit is contained in:
squidfunk 2016-09-04 18:13:17 +02:00
parent adf6f50c3e
commit 6ac4b0f749
18 changed files with 1959 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.sass-lint.yml
View File

@ -104,7 +104,7 @@ rules:
- 2 - 2
- style: double - style: double
shorthand-values: 2 shorthand-values: 2
single-line-per-selector: 0 single-line-per-selector: 2
space-after-bang: 2 space-after-bang: 2
space-after-colon: 2 space-after-colon: 2
space-after-comma: 2 space-after-comma: 2

2
CHANGELOG
View File

@ -11,7 +11,7 @@ mkdocs-material-1.0.0-rc.1 (2016-XX-XX)
* Introduced ESLint and SassLint for code style checks * Introduced ESLint and SassLint for code style checks
* Introduced more accurate Material Design colors and shadows * Introduced more accurate Material Design colors and shadows
* Introduced Modular Scales for harmonic font sizing * Introduced Modular Scales for harmonic font sizing
* Rewrite of CSS using the BEM methodology * Rewrite of CSS using the BEM methodology and SassDoc styles
* Rewrite of JavaScript using ES6 and Babel as a transpiler * Rewrite of JavaScript using ES6 and Babel as a transpiler
* Rewrite of Admonition, Permalinks and Codehilite integration * Rewrite of Admonition, Permalinks and Codehilite integration
* Rewrite of the complete typographical system * Rewrite of the complete typographical system

1841
material/assets/javascripts/modernizr-ca288b1d5b.js Normal file
View File

File diff suppressed because it is too large Load Diff

0
material/assets/javascripts/modernizr-d41d8cd98f.js
View File

1
material/assets/stylesheets/application-67e8d741f4.css
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
material/base.html
View File

@ -25,14 +25,14 @@
<meta name="author" content="{{ site_author }}"> <meta name="author" content="{{ site_author }}">
{% endif %} {% endif %}
{% endblock %} {% endblock %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-67e8d741f4.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-984ab9f73e.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,700"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,700">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
{% for path in extra_css %} {% for path in extra_css %}
<link rel="stylesheet" href="{{ path }}"> <link rel="stylesheet" href="{{ path }}">
{% endfor %} {% endfor %}
<script src="{{ base_url }}/assets/javascripts/modernizr-d41d8cd98f.js"></script> <script src="{{ base_url }}/assets/javascripts/modernizr-ca288b1d5b.js"></script>
</head> </head>
<body> <body>
<input class="md-toggle md-toggle--drawer" type="checkbox" id="drawer"> <input class="md-toggle md-toggle--drawer" type="checkbox" id="drawer">

4
material/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"assets/images/favicon.ico": "assets/images/favicon-e565ddfa3b.ico", "assets/images/favicon.ico": "assets/images/favicon-e565ddfa3b.ico",
"assets/javascripts/application.js": "assets/javascripts/application-e9877e2824.js", "assets/javascripts/application.js": "assets/javascripts/application-e9877e2824.js",
"assets/javascripts/modernizr.js": "assets/javascripts/modernizr-d41d8cd98f.js", "assets/javascripts/modernizr.js": "assets/javascripts/modernizr-ca288b1d5b.js",
"assets/stylesheets/application.css": "assets/stylesheets/application-67e8d741f4.css" "assets/stylesheets/application.css": "assets/stylesheets/application-984ab9f73e.css"
} }

2
material/nav.html
View File

@ -1,7 +1,7 @@
<div class="md-sidebar md-sidebar--primary md-js__sidebar"> <div class="md-sidebar md-sidebar--primary md-js__sidebar">
<div class="md-sidebar__scrollwrap"> <div class="md-sidebar__scrollwrap">
<nav class="md-sidebar__inner md-nav"> <nav class="md-sidebar__inner md-nav">
<h3>Navigation</h3> <h3 class="md-nav__title">Navigation</h3>
<ul class="md-nav__list"> <ul class="md-nav__list">
{% for nav_item in nav %} {% for nav_item in nav %}
{% set path = "md-toggle-nav-" + loop.index | string %} {% set path = "md-toggle-nav-" + loop.index | string %}

2
material/toc.html
View File

@ -5,7 +5,7 @@
{% set toc = (toc | first).children %} {% set toc = (toc | first).children %}
{% endif %} {% endif %}
{% if toc and (toc | first) %} {% if toc and (toc | first) %}
<h3>Table of contents</h3> <h3 class="md-nav__title">Table of contents</h3>
<ul class="md-nav__list"> <ul class="md-nav__list">
{% for toc_item in toc %} {% for toc_item in toc %}
{% include "toc-item.html" %} {% include "toc-item.html" %}

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

@ -33,7 +33,9 @@ html {
} }
// All elements shall inherit the document default // All elements shall inherit the document default
*, *::before, *::after { *,
*::before,
*::after {
box-sizing: inherit; box-sizing: inherit;
-moz-box-sizing: inherit; -moz-box-sizing: inherit;
-webkit-box-sizing: inherit; -webkit-box-sizing: inherit;
@ -46,17 +48,81 @@ html {
text-size-adjust: none; text-size-adjust: none;
} }
// Reset spacing and borders for all tags // Remove margin in all browsers
html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, body {
pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd,
q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, dl, dt, dd, ol,
ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr,
th, td, article, aside, canvas, details, embed, figure, figcaption, footer,
header, hgroup, main, menu, nav, output, ruby, section, summary, time, mark,
audio, video {
margin: 0; margin: 0;
padding: 0; }
border: 0;
// Add correct display property in IE < 9
article,
aside,
figcaption,
figure,
footer,
header,
main,
nav,
section {
display: block;
}
// Reset horizontal rules in FF
hr {
overflow: visible;
box-sizing: content-box;
}
// Reset link styles
a {
color: inherit;
text-decoration: none;
// Remove outline on focused or active links
&:active,
&:hover {
outline-width: 0;
}
}
// Remove gaps in links underline in iOS >= 8 and Safari >= 8
a {
-webkit-text-decoration-skip: objects;
}
// Reset tap outlines on iOS and Android
a,
button,
label,
input {
-webkit-tap-highlight-color: transparent;
}
// Correct font-size in all browsers
small {
font-size: 80%;
}
// Prevent subscript and superscript from affecting line-height
sub,
sup {
position: relative;
font-size: 80%;
line-height: 0;
vertical-align: baseline;
}
// Correct subscript offset
sub {
bottom: -0.25em;
}
// Correct superscript offset
sup {
top: -0.5em;
}
img {
border-style: none;
} }
// Reset table styles // Reset table styles
@ -66,7 +132,8 @@ table {
} }
// Reset table cell styles // Reset table cell styles
td, th { td,
th {
font-weight: normal; font-weight: normal;
text-align: left; text-align: left;
vertical-align: top; vertical-align: top;
@ -88,13 +155,4 @@ input {
appearance: none; appearance: none;
} }
// Reset link styles
a {
color: inherit;
text-decoration: none;
}
// Reset tap outlines on iOS and Android
a, button, label, input {
-webkit-tap-highlight-color: transparent;
}

28
src/assets/stylesheets/base/_typeset.scss
View File

@ -25,7 +25,8 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Default fonts // Default fonts
body, kbd { body,
kbd {
font-family: "Roboto", Helvetica, Arial, sans-serif; font-family: "Roboto", Helvetica, Arial, sans-serif;
font-weight: 400; font-weight: 400;
font-feature-settings: "kern", "onum", "liga"; font-feature-settings: "kern", "onum", "liga";
@ -41,7 +42,8 @@ body, kbd {
} }
// Proportionally spaced fonts // Proportionally spaced fonts
pre, code { pre,
code {
font-family: "Roboto Mono", "Courier New", Courier, monospace; font-family: "Roboto Mono", "Courier New", Courier, monospace;
// Use system fonts, if browser doesn't support webfonts // Use system fonts, if browser doesn't support webfonts
@ -66,6 +68,7 @@ pre, code {
// 1st level headline // 1st level headline
h1 { h1 {
margin: 0 0 4.0rem;
color: $md-color-black--light; color: $md-color-black--light;
font-size: ms(3); font-size: ms(3);
font-weight: 300; font-weight: 300;
@ -75,7 +78,7 @@ pre, code {
// 2nd level headline // 2nd level headline
h2 { h2 {
margin-top: 4.0rem; margin: 4.0rem 0 1.6rem;
font-size: ms(2); font-size: ms(2);
font-weight: 300; font-weight: 300;
letter-spacing: -0.01em; letter-spacing: -0.01em;
@ -84,7 +87,7 @@ pre, code {
// 3rd level headline // 3rd level headline
h3 { h3 {
margin-top: 3.2rem; margin: 3.2rem 0 1.6rem;
font-size: ms(1); font-size: ms(1);
font-weight: 400; font-weight: 400;
letter-spacing: -0.01em; letter-spacing: -0.01em;
@ -98,7 +101,7 @@ pre, code {
// 4th level headline // 4th level headline
h4 { h4 {
margin-top: 1.6rem; margin: 1.6rem 0;
font-size: ms(0); font-size: ms(0);
font-weight: 700; font-weight: 700;
letter-spacing: -0.01em; letter-spacing: -0.01em;
@ -107,7 +110,7 @@ pre, code {
// 5th and 6th level headline // 5th and 6th level headline
h5, h5,
h6 { h6 {
margin-top: 1.6rem; margin: 1.6rem 0;
color: $md-color-black--light; color: $md-color-black--light;
font-size: ms(-1); font-size: ms(-1);
font-weight: 700; font-weight: 700;
@ -119,6 +122,12 @@ pre, code {
text-transform: uppercase; text-transform: uppercase;
} }
// Horizontal separators
hr {
margin: 2.4rem 0;
border-bottom: px2rem(1px) dotted $md-color-black--lighter;
}
// Links // Links
a { a {
color: $md-color-primary; color: $md-color-primary;
@ -181,7 +190,6 @@ pre, code {
// Smaller text // Smaller text
small { small {
color: $md-color-black--light; color: $md-color-black--light;
font-size: smaller;
} }
// Superscript and subscript // Superscript and subscript
@ -190,12 +198,6 @@ pre, code {
margin-left: 0.1rem; margin-left: 0.1rem;
} }
// Horizontal separators
hr {
margin: 2.4rem 0;
border-bottom: px2rem(1px) dotted $md-color-black--lighter;
}
// Blockquotes, possibly nested // Blockquotes, possibly nested
blockquote { blockquote {
padding-left: 1.2rem; padding-left: 1.2rem;

4
src/assets/stylesheets/extensions/_codehilite.scss
View File

@ -109,8 +109,8 @@
.ss { color: #990073; } // Literal.String.Symbol .ss { color: #990073; } // Literal.String.Symbol
// Diffs // Diffs
.gd { background-color: #ffdddd; } // Generic.Deleted .gd { background-color: #FFDDDD; } // Generic.Deleted
.gi { background-color: #ddffdd; } // Generic.Inserted .gi { background-color: #DDFFDD; } // Generic.Inserted
// Miscellaneous // Miscellaneous
.w { color: transparent; } // Text.Whitespace .w { color: transparent; } // Text.Whitespace

2
src/assets/stylesheets/extensions/_footnotes.scss
View File

@ -30,7 +30,7 @@
// Footnote // Footnote
.footnote { .footnote {
color: $md-color-black--light; color: $md-color-black--light;
font-size: smaller; font-size: 80%;
// Remove additional spacing on footnotes // Remove additional spacing on footnotes
> ol { > ol {

14
src/assets/stylesheets/layout/_nav.scss
View File

@ -26,12 +26,14 @@
// Nested navigation // Nested navigation
.md-nav { .md-nav {
font-size: ms(-1);
line-height: 1.2;
// Set font sizes // Title
&, &__title {
h3 { margin: 0;
font-size: ms(-1); font-size: inherit;
line-height: 1.2; line-height: inherit;
} }
// Table of contents // Table of contents
@ -41,6 +43,8 @@
// List of items // List of items
&__list { &__list {
margin: 0;
padding: 0;
list-style: none; list-style: none;
// 2nd+ level list // 2nd+ level list

2
src/nav.html
View File

@ -24,7 +24,7 @@
<div class="md-sidebar md-sidebar--primary md-js__sidebar"> <div class="md-sidebar md-sidebar--primary md-js__sidebar">
<div class="md-sidebar__scrollwrap"> <div class="md-sidebar__scrollwrap">
<nav class="md-sidebar__inner md-nav"> <nav class="md-sidebar__inner md-nav">
<h3>Navigation</h3> <h3 class="md-nav__title">Navigation</h3>
<ul class="md-nav__list"> <ul class="md-nav__list">
{% for nav_item in nav %} {% for nav_item in nav %}
{% set path = "md-toggle-nav-" + loop.index | string %} {% set path = "md-toggle-nav-" + loop.index | string %}

2
src/toc.html
View File

@ -37,7 +37,7 @@
<!-- Render item list --> <!-- Render item list -->
{% if toc and (toc | first) %} {% if toc and (toc | first) %}
<h3>Table of contents</h3> <h3 class="md-nav__title">Table of contents</h3>
<ul class="md-nav__list"> <ul class="md-nav__list">
{% for toc_item in toc %} {% for toc_item in toc %}
{% include "toc-item.html" %} {% include "toc-item.html" %}