From c691fff50187332392092c74af555404b894f85b Mon Sep 17 00:00:00 2001 From: squidfunk Date: Sun, 15 Jan 2017 11:24:32 +0100 Subject: [PATCH 1/2] Prepare 1.0.2 release --- docs/customization.md | 2 +- docs/getting-started.md | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/customization.md b/docs/customization.md index 00cdbcbe0..e27a8ff7f 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -196,7 +196,7 @@ The Material theme uses a sophisticated asset pipeline using [Gulp][9] and Webpack which can be started with the following command: ``` sh -npm run start +npm start ``` This will also start the MkDocs development server which will monitor changes diff --git a/docs/getting-started.md b/docs/getting-started.md index d117d8499..44c1181d2 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -28,7 +28,7 @@ pip install mkdocs && mkdocs --version # mkdocs, version 0.16.0 ``` -!!! warning "MkDocs for Material requirements" +!!! warning "MkDocs version requirements" Material requires MkDocs >= 0.16. diff --git a/package.json b/package.json index ffa581213..b12777d3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mkdocs-material", - "version": "1.0.1", + "version": "1.0.2", "description": "A Material Design theme for MkDocs", "keywords": [ "mkdocs", From 96168d05d8752c4ea24a5270a00383931875af23 Mon Sep 17 00:00:00 2001 From: squidfunk Date: Sun, 15 Jan 2017 11:27:48 +0100 Subject: [PATCH 2/2] Added 1.0.2 to changelog and release notes --- CHANGELOG | 4 ++++ docs/release-notes.md | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cd1fe49b0..84f7551c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +mkdocs-material-1.0.2 (2017-01-15) + + * Fixed horizontal scrollbar in content area + mkdocs-material-1.0.1 (2017-01-14) * Fixed massive repaints happening when scrolling diff --git a/docs/release-notes.md b/docs/release-notes.md index 24b0a81e2..2bbd137a0 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -17,14 +17,18 @@ pip show mkdocs-material | grep -E ^Version ## Changelog -### 1.0.1 _ January 14, 2017 +### 1.0.2 _ January 15, 2017 + + * Fixed horizontal scrollbar in content area + +### 1.0.1 _ January 14, 2017 * Fixed massive repaints happening when scrolling * Fixed footer back reference positions in case of overflow * Fixed header logo from showing when the menu icon is rendered * Changed scrollbar behavior to only show when content overflows -### 1.0.0 _ January 13, 2017 +### 1.0.0 _ January 13, 2017 * Introduced Webpack for more sophisticated JavaScript bundling * Introduced ESLint and Stylelint for code style checks