From 872a953ee05fbf67f50d263f43fb185619b6302f Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Fri, 6 Oct 2017 11:01:31 +0200
Subject: [PATCH] Prepare 1.10.2 release
---
CHANGELOG | 6 +++-
docs/release-notes.md | 8 ++++-
material/base.html | 2 +-
package.json | 2 +-
yarn.lock | 71 ++++++++++++++++++++++++++++++++++---------
5 files changed, 71 insertions(+), 18 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 47400941..c955844c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
+mkdocs-material-1.10.2 (2017-10-06)
+
+ * Fixed #468: Sidebar shows scrollbar if content is shorter (in Safari)
+
mkdocs-material-1.10.1 (2017-09-14)
- * Fixed #455: bold code blocks rendered with normal font weight
+ * Fixed #455: Bold code blocks rendered with normal font weight
mkdocs-material-1.10.0 (2017-09-01)
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 80e81e2d..f72cf542 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -17,9 +17,15 @@ pip show mkdocs-material | grep -E ^Version
## Changelog
+### 1.10.2 <small>_ October 6, 2017</small>
+
+* Fixed [#468][468]: Sidebar shows scrollbar if content is shorter (in Safari)
+
+ [468]: https://github.com/squidfunk/mkdocs-material/issues/468
+
### 1.10.1 <small>_ September 14, 2017</small>
-* Fixed [#455][455]: bold code blocks rendered with normal font weight
+* Fixed [#455][455]: Bold code blocks rendered with normal font weight
[455]: https://github.com/squidfunk/mkdocs-material/issues/455
diff --git a/material/base.html b/material/base.html
index dd1de4e6..6cc6bee8 100644
--- a/material/base.html
+++ b/material/base.html
@@ -24,7 +24,7 @@
{% else %}
<link rel="shortcut icon" href="{{ base_url }}/assets/images/favicon.png">
{% endif %}
- <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-1.10.1">
+ <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-1.10.2">
{% endblock %}
{% block htmltitle %}
{% if page and page.meta.title %}
diff --git a/package.json b/package.json
index ab5a7efb..98afd8a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "mkdocs-material",
- "version": "1.10.1",
+ "version": "1.10.2",
"description": "A Material Design theme for MkDocs",
"keywords": [
"mkdocs",
diff --git a/yarn.lock b/yarn.lock
index e4cdf2ad..473ca965 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1049,6 +1049,14 @@ chalk@^2.0.0, chalk@^2.0.1:
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"
+chalk@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
+ dependencies:
+ ansi-styles "^3.1.0"
+ escape-string-regexp "^1.0.5"
+ supports-color "^4.0.0"
+
chokidar@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -2061,9 +2069,9 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-flow-bin@^0.54.0:
- version "0.54.0"
- resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.54.0.tgz#f2fb0478e9e99702b623c9ed84079a39903bba77"
+flow-bin@^0.56.0:
+ version "0.56.0"
+ resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.56.0.tgz#ce43092203a344ba9bf63c0cabe95d95145f6cad"
flow-jsdoc@^0.3.0:
version "0.3.0"
@@ -4425,12 +4433,12 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2, postcss-selector
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss-sorting@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-3.0.1.tgz#13d42b255e7881fb33d19dcaa4085580be90664c"
+postcss-sorting@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-3.0.2.tgz#73e6913b715426201d22e8a1769b05022a37aafc"
dependencies:
lodash "^4.17.4"
- postcss "^6.0.1"
+ postcss "^6.0.11"
postcss-svgo@^2.1.1:
version "2.1.6"
@@ -4479,7 +4487,7 @@ postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.16, postcss@^5.0
source-map "^0.5.6"
supports-color "^3.2.3"
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.7:
+postcss@^6.0.0, postcss@^6.0.3, postcss@^6.0.6:
version "6.0.8"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.8.tgz#89067a9ce8b11f8a84cbc5117efc30419a0857b3"
dependencies:
@@ -4487,6 +4495,14 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.7:
source-map "^0.5.6"
supports-color "^4.2.0"
+postcss@^6.0.11:
+ version "6.0.13"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f"
+ dependencies:
+ chalk "^2.1.0"
+ source-map "^0.6.1"
+ supports-color "^4.4.0"
+
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -5040,6 +5056,10 @@ source-map@^0.1.38:
dependencies:
amdefine ">=0.0.4"
+source-map@^0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
sparkles@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
@@ -5219,14 +5239,13 @@ stylelint-config-standard@^17.0.0:
dependencies:
stylelint-config-recommended "^1.0.0"
-stylelint-order@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-0.6.0.tgz#72222be0c64d8782b2fc237d0d9ac974039f968b"
+stylelint-order@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-0.7.0.tgz#ceab5cbe24aa33fa63590024995395f6edfc9ab7"
dependencies:
lodash "^4.17.4"
- postcss "^6.0.7"
- postcss-sorting "^3.0.1"
- stylelint "^8.0.0"
+ postcss "^6.0.11"
+ postcss-sorting "^3.0.2"
stylelint-scss@^2.0.0:
version "2.0.0"
@@ -5311,6 +5330,12 @@ supports-color@^4.2.0, supports-color@^4.2.1:
dependencies:
has-flag "^2.0.0"
+supports-color@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+ dependencies:
+ has-flag "^2.0.0"
+
svg-tags@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
@@ -5921,6 +5946,24 @@ yargs@^8.0.2:
y18n "^3.2.1"
yargs-parser "^7.0.0"
+yargs@^9.0.1:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+ dependencies:
+ camelcase "^4.1.0"
+ cliui "^3.2.0"
+ decamelize "^1.1.1"
+ get-caller-file "^1.0.1"
+ os-locale "^2.0.0"
+ read-pkg-up "^2.0.0"
+ require-directory "^2.1.1"
+ require-main-filename "^1.0.1"
+ set-blocking "^2.0.0"
+ string-width "^2.0.0"
+ which-module "^2.0.0"
+ y18n "^3.2.1"
+ yargs-parser "^7.0.0"
+
yargs@~3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
--
GitLab