From badeb7e86f25bd579a5d64728fd5cb84cfd23cea Mon Sep 17 00:00:00 2001 From: squidfunk Date: Sat, 21 Oct 2017 23:17:08 +0200 Subject: [PATCH] Added missing theme configuration file for mkdocs 0.17 --- CHANGELOG | 5 +++++ MANIFEST.in | 2 +- lib/tasks/views/build.js | 2 +- material/mkdocs_theme.yml | 19 +++++++++++++++++++ src/mkdocs_theme.yml | 23 +++++++++++++++++++++++ 5 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 material/mkdocs_theme.yml create mode 100644 src/mkdocs_theme.yml diff --git a/CHANGELOG b/CHANGELOG index 5b725aaaa..cfeffea6f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +mkdocs-material-1.12.1 (2017-10-xx) + + * Improved downward compatibility with custom partials + * Fixed #519: Missing theme configuration file + mkdocs-material-1.12.0 (2017-10-20) * Added support for setting language(s) via mkdocs.yml diff --git a/MANIFEST.in b/MANIFEST.in index e09b4cbfd..8f43a2f23 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -recursive-include material *.ico *.js *.css *.html *.svg +recursive-include material *.ico *.js *.css *.html *.svg *.yml recursive-exclude site * recursive-exclude * __pycache__ recursive-exclude * *.py[co] diff --git a/lib/tasks/views/build.js b/lib/tasks/views/build.js index bf47223d8..13e24701a 100644 --- a/lib/tasks/views/build.js +++ b/lib/tasks/views/build.js @@ -35,7 +35,7 @@ import version from "gulp-rev-replace" export default (gulp, config, args) => { return () => { const metadata = require(path.join(process.cwd(), "./package.json")) - return gulp.src(`${config.views.src}/**/*.{html,py}`) + return gulp.src(`${config.views.src}/**/*.{html,py,yml}`) .pipe(changed(config.views.build)) .pipe( minhtml({ diff --git a/material/mkdocs_theme.yml b/material/mkdocs_theme.yml new file mode 100644 index 000000000..6eb76f31b --- /dev/null +++ b/material/mkdocs_theme.yml @@ -0,0 +1,19 @@ +# Copyright (c) 2016-2017 Martin Donath +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# Static pages to build +static_templates: + - 404.html diff --git a/src/mkdocs_theme.yml b/src/mkdocs_theme.yml new file mode 100644 index 000000000..fa88c3896 --- /dev/null +++ b/src/mkdocs_theme.yml @@ -0,0 +1,23 @@ +# Copyright (c) 2016-2017 Martin Donath + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +# Static pages to build +static_templates: + - 404.html