Compare commits

..
5 Commits
15 changed files with 44 additions and 17 deletions
+7
View File
@@ -1,3 +1,10 @@
mkdocs-material-0.2.4 (2016-06-26)
* Fixed improperly set set default favicon
* Fixed #33: Protocol relative URL for webfonts doesn't work with file://
* Fixed #34: IE11 on Windows 7 doesn't honor max-width on main tag
* Fixed #35: Add styling for blockquotes
mkdocs-material-0.2.3 (2016-05-16)
* Fixed #25: Highlight inline fenced blocks
-3
View File
@@ -1,7 +1,6 @@
# Material
[![Travis CI][travis-image]][travis-link]
[![PyPI Downloads][pypi-dl-image]][pypi-dl-link]
[![PyPI Version][pypi-v-image]][pypi-v-link]
A material design theme for [MkDocs](http://www.mkdocs.org).
@@ -51,7 +50,5 @@ IN THE SOFTWARE.
[travis-image]: https://travis-ci.org/squidfunk/mkdocs-material.svg
[travis-link]: https://travis-ci.org/squidfunk/mkdocs-material
[pypi-dl-image]: https://img.shields.io/pypi/dm/mkdocs-material.png
[pypi-dl-link]: https://pypi.python.org/pypi/mkdocs-material
[pypi-v-image]: https://img.shields.io/pypi/v/mkdocs-material.png
[pypi-v-link]: https://pypi.python.org/pypi/mkdocs-material
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "mkdocs-material",
"version": "0.2.3",
"version": "0.2.4",
"description": "A material design theme for MkDocs",
"homepage": "http://squidfunk.github.io/mkdocs-material/",
"authors": [
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+4 -4
View File
@@ -34,7 +34,7 @@
{% if config.extra.logo %}
<link rel="apple-touch-icon" href="{{ base_url }}/{{ config.extra.logo }}">
{% endif %}
{% set favicon = favicon | default("assets/images/favicon-e565ddfa3b.ico") %}
{% set favicon = favicon | default("assets/images/favicon-e565ddfa3b.ico", true) %}
<link rel="shortcut icon" type="image/x-icon" href="{{ base_url }}/{{ favicon }}">
<link rel="icon" type="image/x-icon" href="{{ base_url }}/{{ favicon }}">
<style>
@@ -53,7 +53,7 @@
font-style: normal;
}
</style>
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-0dac3e5884.css">
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-a422ff04cc.css">
{% if config.extra.palette %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/palettes-05ab2406df.css">
{% endif %}
@@ -61,7 +61,7 @@
{% set text = config.extra.get("font", {}).text | default("Ubuntu") %}
{% set code = config.extra.get("font", {}).code | default("Ubuntu Mono") %}
{% set font = text + ':400,700|' + code | replace(' ', '+') %}
<link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family={{ font }}">
<style>
body, input {
font-family: '{{ text }}', Helvetica, Arial, sans-serif;
@@ -151,7 +151,7 @@
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;
m.parentNode.insertBefore(a,m)
})(window, document,
'script', '//www.google-analytics.com/analytics.js', 'ga');
'script', 'https://www.google-analytics.com/analytics.js', 'ga');
/* General initialization */
ga('create', '{{ google_analytics[0] }}', '{{ google_analytics[1] }}');
ga('set', 'anonymizeIp', true);
+1 -1
View File
@@ -2,6 +2,6 @@
"assets/images/favicon.ico": "assets/images/favicon-e565ddfa3b.ico",
"assets/javascripts/application.js": "assets/javascripts/application-997097ee0c.js",
"assets/javascripts/modernizr.js": "assets/javascripts/modernizr-4ab42b99fd.js",
"assets/stylesheets/application.css": "assets/stylesheets/application-0dac3e5884.css",
"assets/stylesheets/application.css": "assets/stylesheets/application-a422ff04cc.css",
"assets/stylesheets/palettes.css": "assets/stylesheets/palettes-05ab2406df.css"
}
+1 -1
View File
@@ -36,7 +36,7 @@ theme_dir: material
# Options
extra:
version: 0.2.3
version: 0.2.4
logo: images/logo.png
author:
github: squidfunk
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "mkdocs-material",
"version": "0.2.3",
"version": "0.2.4",
"description": "A material design theme for MkDocs",
"homepage": "http://squidfunk.github.io/mkdocs-material/",
"authors": [
+1 -1
View File
@@ -23,7 +23,7 @@ from setuptools import setup, find_packages
# Package description
setup(
name = 'mkdocs-material',
version = '0.2.3',
version = '0.2.4',
url = 'http://squidfunk.github.io/mkdocs-material/',
license = 'MIT',
description = 'A material design theme for MkDocs',
+8
View File
@@ -72,6 +72,14 @@ time, mark, audio, video {
border: 0;
}
/*
* Enforce correct rendering of main element - missing in user agent stylesheet
* of IE11 on Windows 7.
*/
main {
display: block;
}
/*
* Reset list styles
*/
@@ -121,6 +121,14 @@
border-top: 1px solid rgba($black, 0.05);
}
}
/*
* Blockquote styles
*/
blockquote {
border-left: 2px solid $black-light;
color: $black-light;
}
}
/*
@@ -265,6 +265,13 @@
}
}
/*
* Blockquote styles
*/
blockquote {
padding-left: 16px;
}
/*
* Data table wrapper, in case javascript is available
*/
+3 -3
View File
@@ -58,7 +58,7 @@
{% endif %}
<!-- Favicon -->
{% set favicon = favicon | default("assets/images/favicon.ico") %}
{% set favicon = favicon | default("assets/images/favicon.ico", true) %}
<link rel="shortcut icon" type="image/x-icon"
href="{{ base_url }}/{{ favicon }}" />
<link rel="icon" type="image/x-icon"
@@ -98,7 +98,7 @@
{% set code = config.extra.get("font", {}).code | default("Ubuntu Mono") %}
{% set font = text + ':400,700|' + code | replace(' ', '+') %}
<link rel="stylesheet" type="text/css"
href="//fonts.googleapis.com/css?family={{ font }}" />
href="https://fonts.googleapis.com/css?family={{ font }}" />
<style>
body, input {
font-family: '{{ text }}', Helvetica, Arial, sans-serif;
@@ -241,7 +241,7 @@
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;
m.parentNode.insertBefore(a,m)
})(window, document,
'script', '//www.google-analytics.com/analytics.js', 'ga');
'script', 'https://www.google-analytics.com/analytics.js', 'ga');
/* General initialization */
ga('create', '{{ google_analytics[0] }}', '{{ google_analytics[1] }}');