mirror of
https://github.com/squidfunk/mkdocs-material.git
synced 2024-11-28 09:20:52 +01:00
Merge branch 'master' into refactor/rxjs-typescript
This commit is contained in:
commit
d21da8d522
25
.dockerignore
Normal file
25
.dockerignore
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
# Copyright (c) 2016-2020 Martin Donath <martin.donath@squidfunk.com>
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
.git
|
||||||
|
.github
|
||||||
|
docs
|
||||||
|
node_modules
|
||||||
|
src
|
20
.github/workflows/ci.yml
vendored
20
.github/workflows/ci.yml
vendored
@ -80,14 +80,14 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
python-version: 3.x
|
python-version: 3.x
|
||||||
|
|
||||||
- uses: actions/cache@v1
|
# - uses: actions/cache@v1
|
||||||
id: cache-python
|
# id: cache-python
|
||||||
with:
|
# with:
|
||||||
path: ~/.cache/pip
|
# path: ~/.cache/pip
|
||||||
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
|
# key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
|
||||||
|
|
||||||
- if: steps.cache-python.outputs.cache-hit != 'true'
|
# - if: steps.cache-python.outputs.cache-hit != 'true'
|
||||||
run: pip install -r requirements.txt
|
- run: pip install -r requirements.txt
|
||||||
|
|
||||||
# Set configuration for repository and deploy documentation
|
# Set configuration for repository and deploy documentation
|
||||||
- env:
|
- env:
|
||||||
@ -100,8 +100,10 @@ jobs:
|
|||||||
git config --global user.email "${GH_EMAIL}"
|
git config --global user.email "${GH_EMAIL}"
|
||||||
git remote set-url origin ${REMOTE}
|
git remote set-url origin ${REMOTE}
|
||||||
|
|
||||||
# Install theme
|
# Install theme and dependencies
|
||||||
- run: python setup.py install
|
- run: |
|
||||||
|
python setup.py install
|
||||||
|
pip install mkdocs-minify-plugin>=0.2
|
||||||
|
|
||||||
# Build documentation
|
# Build documentation
|
||||||
- env:
|
- env:
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
mkdocs-material 4.6.3 (2020-02-14)
|
||||||
|
|
||||||
|
* Removed optional third-party plugins from requirements.txt
|
||||||
|
* Updated Docker image to contain all supported third-party plugins
|
||||||
|
|
||||||
mkdocs-material 4.6.2 (2020-02-08)
|
mkdocs-material 4.6.2 (2020-02-08)
|
||||||
|
|
||||||
* Added Romanian translations
|
* Added Romanian translations
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
# IN THE SOFTWARE.
|
# IN THE SOFTWARE.
|
||||||
|
|
||||||
FROM python:3.6.8-alpine3.9
|
FROM python:3.8.1-alpine3.11
|
||||||
|
|
||||||
# Set build directory
|
# Set build directory
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
@ -38,7 +38,10 @@ RUN \
|
|||||||
git-fast-import \
|
git-fast-import \
|
||||||
openssh \
|
openssh \
|
||||||
&& python setup.py install \
|
&& python setup.py install \
|
||||||
&& rm -rf /tmp/*
|
&& rm -rf /tmp/* \
|
||||||
|
&& pip install --no-cache-dir \
|
||||||
|
'mkdocs-minify-plugin>=0.2' \
|
||||||
|
'mkdocs-git-revision-date-localized-plugin>=0.4'
|
||||||
|
|
||||||
# Set working directory
|
# Set working directory
|
||||||
WORKDIR /docs
|
WORKDIR /docs
|
||||||
|
@ -64,6 +64,11 @@ pip show mkdocs-material
|
|||||||
|
|
||||||
## Changelog
|
## Changelog
|
||||||
|
|
||||||
|
### 4.6.3 <small>_ February 14, 2020</small>
|
||||||
|
|
||||||
|
* Removed optional third-party plugins from `requirements.txt`
|
||||||
|
* Updated Docker image to contain all supported third-party plugins
|
||||||
|
|
||||||
### 4.6.2 <small>_ February 8, 2020</small>
|
### 4.6.2 <small>_ February 8, 2020</small>
|
||||||
|
|
||||||
* Added Romanian translations
|
* Added Romanian translations
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<label class="md-search__overlay" for="__search"></label>
|
<label class="md-search__overlay" for="__search"></label>
|
||||||
<div class="md-search__inner" role="search">
|
<div class="md-search__inner" role="search">
|
||||||
<form class="md-search__form" name="search">
|
<form class="md-search__form" name="search">
|
||||||
<input type="text" class="md-search__input" name="query" placeholder="{{ lang.t('search.placeholder') }}" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" data-md-component="search-query" data-md-state="active" required>
|
<input type="text" class="md-search__input" name="query" aria-label="search" placeholder="{{ lang.t('search.placeholder') }}" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" data-md-component="search-query" data-md-state="active" required>
|
||||||
<label class="md-icon md-search__icon" for="__search"></label>
|
<label class="md-icon md-search__icon" for="__search"></label>
|
||||||
<button type="reset" class="md-icon md-search__icon" data-md-component="search-reset" tabindex="-1">
|
<button type="reset" class="md-icon md-search__icon" data-md-component="search-reset" tabindex="-1">
|
||||||

|

|
||||||
|
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mkdocs-material",
|
"name": "mkdocs-material",
|
||||||
"version": "5.0.0dev0",
|
"version": "5.0.0b1",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
|
|
||||||
# Direct dependencies
|
# Direct dependencies
|
||||||
mkdocs>=1.0
|
mkdocs>=1.0
|
||||||
mkdocs-minify-plugin>=0.2
|
Pygments>=2.4
|
||||||
Pygments>=2.2
|
|
||||||
markdown>=3.2
|
markdown>=3.2
|
||||||
pymdown-extensions>=7.0b1
|
pymdown-extensions>=7.0b1
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
class="md-search__input"
|
class="md-search__input"
|
||||||
name="query"
|
name="query"
|
||||||
|
aria-label="search"
|
||||||
placeholder="{{ lang.t('search.placeholder') }}"
|
placeholder="{{ lang.t('search.placeholder') }}"
|
||||||
autocapitalize="off"
|
autocapitalize="off"
|
||||||
autocorrect="off"
|
autocorrect="off"
|
||||||
|
Loading…
Reference in New Issue
Block a user