Merge branch 'master' into dms-v10

This commit is contained in:
Frederic Werner 2021-05-20 18:57:10 +02:00 committed by GitHub
commit 02d06e1607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 303 additions and 268 deletions

View File

@ -0,0 +1,119 @@
name: 'Documentation (run)'
on:
workflow_run:
workflows: ['Documentation (PR)']
types:
- completed
# Note: If limiting concurrency is required for this workflow:
# 1. Add an additional job prior to `preview` to get the PR number make it an output.
# 2. Assign that new job as a `needs` dependency for the `preview` job.
# It is still required for `preview` job to download the artifact so that it can access the preview build files.
# This workflow runs off the primary branch and has access to secrets as expected.
jobs:
preview:
name: 'Deploy Preview'
runs-on: ubuntu-20.04
if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
steps:
# ======================== #
# Restore workflow context #
# ======================== #
# The official Github Action for downloading artifacts does not support multi-workflow
- name: 'Download build artifact'
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
run_id: ${{ github.event.workflow_run.id }}
workflow: docs-preview-prepare.yml
name: preview-build
- name: 'Extract build artifact'
run: tar -xf artifact.tar.zst
- name: 'Restore preserved ENV'
run: cat pr.env >> "${GITHUB_ENV}"
# ==================== #
# Deploy preview build #
# ==================== #
# Manage workflow deployment status. `enable-commit-status` from `nwtgck/actions-netlify` would handle this,
# but presently does not work correctly via split workflow. It is useful in a split workflow as the 1st stage
# no longer indicates if the entire workflow/deployment was successful.
- name: 'Commit Status: Set Workflow Status as Pending'
uses: myrotvorets/set-commit-status-action@1.0.2
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: pending
# Should match `env.PR_HEADSHA` when triggered by `pull_request` event workflow,
# Avoids failure of ENV being unavailable if job fails early:
sha: ${{ github.event.workflow_run.head_sha }}
context: 'Deploy Preview (pull_request => workflow_run)'
- name: 'Send preview build to Netlify'
uses: nwtgck/actions-netlify@v1.2
id: preview
timeout-minutes: 1
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
# Fail the job early if credentials are missing / invalid:
fails-without-credentials: true
# Sets/creates the Netlify deploy URL prefix.
# Uses the PR number for uniqueness:
alias: ${{ env.NETLIFY_SITE_PREFIX }}
# Only publish the contents of the build output:
publish-dir: ${{ env.BUILD_DIR }}
# Custom message for the deploy log on Netlify:
deploy-message: '${{ env.PR_TITLE }} (PR #${{ env.PR_NUMBER }} @ commit: ${{ env.PR_HEADSHA }})'
# Note: Split workflow incorrectly references latest primary branch commit for deployment.
# Assign to non-default Deployment Environment for better management:
github-deployment-environment: documentation-previews
github-deployment-description: 'Preview deploy for documentation PRs'
# Note - PR context used by this action is incorrect. These features are broken with split workflow:
# https://github.com/nwtgck/actions-netlify/issues/545
# Disable unwanted action defaults:
# Disable adding deploy comment on pre-merge commit (Github creates this for PR diff):
enable-commit-comment: false
# Disable adding a "Netlify - Netlify deployment" check status:
enable-commit-status: false
# Disable. We provide a custom PR comment in the next action:
enable-pull-request-comment: false
# If a `netlify.toml` config is ever needed, enable this:
# netlify-config-path: ./docs/netlify.toml
# If ever switching from Github Pages, enable this conditionally (false by default):
# production-deploy: false
- name: 'Comment on PR: Add/Update deployment status'
uses: marocchino/sticky-pull-request-comment@v2
with:
number: ${{ env.PR_NUMBER }}
header: preview-comment
message: |
[Documentation preview for this PR](${{ steps.preview.outputs.deploy-url }}) is ready! :tada:
Built with commit: ${{ env.PR_HEADSHA }}
- name: 'Commit Status: Update deployment status'
uses: myrotvorets/set-commit-status-action@1.0.2
# Always run this step regardless of job failing early:
if: ${{ always() }}
env:
DEPLOY_SUCCESS: Successfully deployed preview.
DEPLOY_FAILURE: Failed to deploy preview.
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: ${{ job.status == 'success' && 'success' || 'failure' }}
sha: ${{ github.event.workflow_run.head_sha }}
context: 'Deploy Preview (pull_request => workflow_run)'
description: ${{ job.status == 'success' && env.DEPLOY_SUCCESS || env.DEPLOY_FAILURE }}

View File

@ -0,0 +1,70 @@
name: 'Documentation (PR)'
on:
pull_request:
paths:
- 'docs/**'
# If the workflow for a PR is triggered multiple times, previous existing runs will be canceled.
# eg: Applying multiple suggestions from a review directly via the Github UI.
# Instances of the 2nd phase of this workflow (via `workflow_run`) presently lack concurrency limits due to added complexity.
concurrency:
group: deploypreview-pullrequest-${{ github.event.pull_request.number }}
cancel-in-progress: true
# `pull_request` workflow is unreliable alone: Non-collaborator contributions lack access to secrets for security reasons.
# A separate workflow (docs-preview-deploy.yml) handles the deploy after the potentially untrusted code is first run in this workflow.
# See: https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
jobs:
prepare-preview:
name: 'Build Preview'
runs-on: ubuntu-20.04
env:
BUILD_DIR: docs/site
NETLIFY_SITE_PREFIX: pullrequest-${{ github.event.pull_request.number }}
NETLIFY_SITE_NAME: dms-doc-previews
steps:
- uses: actions/checkout@v2.3.4
- name: 'Build with mkdocs-material via Docker'
working-directory: docs
env:
PREVIEW_URL: 'https://${NETLIFY_SITE_PREFIX}--${NETLIFY_SITE_NAME}.netlify.app/'
NETLIFY_BRANDING: '<a href="https://www.netlify.com/"><img alt="Deploys by Netlify" src="https://www.netlify.com/img/global/badges/netlify-color-accent.svg" style="float: right;"></a>'
run: |
# Adjust mkdocs.yml for preview build
sed -i "s|^site_url:.*|site_url: '${PREVIEW_URL}'|" mkdocs.yml
# Insert sponsor branding into page content (Provider OSS plan requirement):
# Upstream does not provide a nicer maintainable way to do this..
# Prepends HTML to copyright text and then aligns to the right side.
sed -i "s|^copyright: '|copyright: '${NETLIFY_BRANDING}|" mkdocs.yml
# Need to override a CSS media query for parent element to always be full width:
echo '.md-footer-copyright { width: 100%; }' >> content/assets/css/customizations.css
../.github/workflows/scripts/docs/build-docs.sh
# ============================== #
# Volley over to secure workflow #
# ============================== #
# Minimize risk of upload failure by bundling files to a single compressed archive (tar + zstd).
# Bundles build dir and env file into a compressed archive, nested file paths will be preserved.
- name: 'Prepare artifact for transfer'
run: |
# Save ENV for transfer
echo "PR_HEADSHA=${{ github.event.pull_request.head.sha }}" >> pr.env
echo "PR_NUMBER=${{ github.event.pull_request.number }}" >> pr.env
echo "PR_TITLE=${{ github.event.pull_request.title }}" >> pr.env
echo "NETLIFY_SITE_PREFIX=${{ env.NETLIFY_SITE_PREFIX }}" >> pr.env
echo "BUILD_DIR=${{ env.BUILD_DIR }}" >> pr.env
tar --zstd -cf artifact.tar.zst pr.env ${{ env.BUILD_DIR }}
- name: 'Upload artifact for workflow transfer'
uses: actions/upload-artifact@v2
with:
name: preview-build
path: artifact.tar.zst
retention-days: 1

View File

@ -40,8 +40,7 @@ jobs:
- name: 'Build with mkdocs-material via Docker'
working-directory: docs
# --user is required for build output file ownership to match the CI user instead of the containers internal user
run: docker run --rm --user "$(id -u):$(id -g)" -v "${PWD}:/docs" squidfunk/mkdocs-material:7.1.4 build --strict
run: '../.github/workflows/scripts/docs/build-docs.sh'
- name: 'If a tagged version, fix canonical links and remove `404.html`'
if: startsWith(github.ref, 'refs/tags/')
@ -51,8 +50,8 @@ jobs:
# (Note the edge 404.html isn't useful either as it's not copied to the `gh-pages` branch root)
rm 404.html
# Replace '${DOCS_VERSION}' (defaults to 'edge') in the 'canonical' link element of HTML files,
# with the tagged docs version:
# Replace the tagged '${DOCS_VERSION}' in the 'canonical' link element of HTML files,
# to point to the 'edge' version of docs as the authoritative source:
find . -type f -name "*.html" -exec \
sed -i "s|^\(.*<link rel=\"canonical\".*\)${DOCS_VERSION}|\1edge|" \
{} +

View File

@ -1,22 +0,0 @@
name: 'Documentation'
on:
pull_request:
paths:
- '.github/workflows/pr-docs.yml'
- 'docs/**'
# Jobs will run shell commands from this subdirectory:
defaults:
run:
working-directory: docs
jobs:
build:
name: 'Verify Build'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2.3.4
- name: 'Build with mkdocs-material via Docker'
run: docker run --rm -v ${PWD}:/docs squidfunk/mkdocs-material:7.1.4 build --strict

16
.github/workflows/scripts/docs/build-docs.sh vendored Executable file
View File

@ -0,0 +1,16 @@
#!/bin/bash
# `--user` is required for build output file ownership to match the CI user,
# instead of the internal root user of the container.
docker run \
--rm \
--user "$(id -u):$(id -g)" \
-v "${PWD}:/docs" \
squidfunk/mkdocs-material:7.1.5 build --strict
# Remove unnecessary build artifacts: https://github.com/squidfunk/mkdocs-material/issues/2519
cd site || exit
find . -type f -name '*.min.js.map' -delete -o -name '*.min.css.map' -delete
rm sitemap.xml.gz
rm assets/images/favicon.png
rm -r assets/javascripts/lunr

View File

@ -3,7 +3,8 @@
# CI ENV `GITHUB_REF` from Github Actions CI provides the tag or branch that triggered the build
# See `github.ref`: https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#github-context
# https://docs.github.com/en/actions/reference/environment-variables
function _update-versions-json {
function _update_versions_json
{
# Extract the version tag, truncate `<PATCH>` version and any suffix beyond it.
local MAJOR_MINOR
MAJOR_MINOR=$(grep -oE 'v[0-9]+\.[0-9]+' <<< "${GITHUB_REF}")

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
id="dmo-logo-monochromatic"
viewBox="20 244 512 512"
xmlns="http://www.w3.org/2000/svg"
>
<g id="envelope">
<path
id="base"
d="m 122,490 h 172 l 70,-27 a 10,10 0 0 0 6,-12 L 315,305 A 10,10 0 0 0 302,300 L 90,380 a 10,10 0 0 0 -6,12 z"
fill="#e3e3e3"
/>
<path
id="bottom"
d="m 294,490 70,-27 a 10,10 0 0 0 5,-5 L 220,404 174,490 Z"
fill="#d4d4d4"
/>
<path
id="top"
d="m 84,387 150,53 75,-140 a 10,10 0 0 0 -7,0 l -212,80 a 10,10 0 0 0 -6,6 z"
fill="#ffffff"
/>
</g>
<path
id="whale-silhouette"
d="M 403,153 C 401,153 398,154 396,156 c -2,3 -20,23 -16,69 1,3 0,7 -2,9 -1,2 -4,3 -7,3 H 16.6 c -2.6,0 -5.4,1 -7.6,3 -2,2 -3,5 -3,8 0,160 117,177 168,177 129,0 219,-78 258,-148 52,-8 74,-43 75,-45 3,-5 1,-11 -4,-14 -1,-1 -31,-20 -59,-15 -7,-29 -33,-47 -35,-48 -1.75,-1.3 -3.7,-1.86 -5.66,-1.8 z M 112,300 a 21,21 0 0 1 21,21 21,21 0 0 1 -21,21 21,21 0 0 1 -21,-21 21,21 0 0 1 21,-21 z"
fill="#ffffff"
transform="translate(20,244)"
/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
id="dmo-logo"
viewBox="20 244 512 512"
xmlns="http://www.w3.org/2000/svg"
>
<g id="envelope">
<path
id="base"
d="m 122,490 h 172 l 70,-27 a 10,10 0 0 0 6,-12 L 315,305 A 10,10 0 0 0 302,300 L 90,380 a 10,10 0 0 0 -6,12 z"
fill="#f3ac47"
/>
<path
id="bottom"
d="m 294,490 70,-27 a 10,10 0 0 0 5,-5 L 220,404 174,490 Z"
fill="#f19a3d"
/>
<path
id="top"
d="m 84,387 150,53 75,-140 a 10,10 0 0 0 -7,0 l -212,80 a 10,10 0 0 0 -6,6 z"
fill="#ffd15c"
/>
</g>
<g id="whale">
<path
id="body-outline"
d="M 523 462 C 522 461 492 442 464 447 C 457 418 431 400 429 399 C 425 396 420 397 416 400 C 414 403 396 423 400 469 C 401 472 400 476 398 478 C 397 480 394 481 391 481 L 36.6 481 C 34 481 31.2 482 29 484 C 27 486 26 489 26 492 C 26 652 143 669 194 669 C 323 669 413 591 452 521 C 504 513 526 478 527 476 C 530 471 528 465 523 462 Z"
fill="#303c42"
/>
<path
id="body-fill"
d="M 445 501 C 441 502 438 504 437 507 C 402 572 317 649 194 649 C 140 649 52 629 47 502 L 391 502 C 400 502 408 498 414 492 C 420 485 423 476 422 467 C 420 446 423 432 426 424 C 434 431 445 444 445 460 C 445 464 446 467 450 469 C 453 471 456 471 460 470 C 472 463 490 469 502 474 C 493 484 475 498 445 501 Z"
fill="#42a5f5"
/>
<path
id="body-shadow"
d="M 445 491 C 441 491 438 493 437 496 C 402 562 317 638 194 638 C 142 638 57 620 48 502 L 47 502 C 52 629 140 649 194 649 C 317 649 402 572 437 507 C 438 504 441 502 445 501 C 475 498 493 484 502 474 C 499 473 497 472 494 471 C 484 479 468 488 445 491 Z"
opacity="0.1"
/>
<circle
id="eye"
cx="132"
cy="565"
r="21"
fill="#303c42"
/>
<circle
id="eye-highlight"
cx="141"
cy="559"
r="6.76"
fill="#ffffff"
/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -0,0 +1 @@
<svg viewBox="20 244 512 512" xmlns="http://www.w3.org/2000/svg"><path d="M122 490h172l70-27a10 10 0 0 0 6-12l-55-146a10 10 0 0 0-13-5L90 380a10 10 0 0 0-6 12z" fill="#e3e3e3"/><path d="m294 490 70-27a10 10 0 0 0 5-5l-149-54-46 86z" fill="#d4d4d4"/><path d="m84 387 150 53 75-140a10 10 0 0 0-7 0L90 380a10 10 0 0 0-6 6z" fill="#fff"/><path d="M423 397c-2 0-5 1-7 3-2 3-20 23-16 69 1 3 0 7-2 9-1 2-4 3-7 3H36.6c-2.6 0-5.4 1-7.6 3-2 2-3 5-3 8 0 160 117 177 168 177 129 0 219-78 258-148 52-8 74-43 75-45 3-5 1-11-4-14-1-1-31-20-59-15-7-29-33-47-35-48-1.75-1.3-3.7-1.86-5.66-1.8zM132 544a21 21 0 0 1 21 21 21 21 0 0 1-21 21 21 21 0 0 1-21-21 21 21 0 0 1 21-21z" fill="#fff"/></svg>

After

Width:  |  Height:  |  Size: 677 B

View File

@ -1 +0,0 @@
<svg viewBox="20.7 244.9 512 512" xmlns="http://www.w3.org/2000/svg"><defs><filter id="a" x="0" y="0" width="1" height="1" color-interpolation-filters="sRGB"><feColorMatrix values="0.21 0.72 0.072 0.18 0 0.21 0.72 0.072 0.18 0 0.21 0.72 0.072 0.18 0 0 0 0 1 0"/></filter></defs><g fill="none" stroke-miterlimit="10" transform="matrix(2.4982 0 0 2.4982 29.044 225.184)" filter="url(#a)"><path d="M37.133 105.617h68.54l28.007-10.634a3.822 3.822 0 002.216-4.93L113.933 32.2a3.821 3.821 0 00-4.93-2.216l-84.34 32.021a3.821 3.821 0 00-2.215 4.93z" fill="#f3ac47"/><path d="M105.674 105.617l28.009-10.634a3.8 3.8 0 002.073-1.907L76.443 71.304l-18.448 34.313z" fill="#f19a3d"/><path d="M22.386 64.451l59.517 21.233 29.918-55.65a3.799 3.799 0 00-2.817-.05l-84.34 32.022a3.796 3.796 0 00-2.278 2.445z" fill="#ffd15c"/></g><path d="M422.26 398.804a10.4 10.4 0 00-6.387 3.14c-2.084 2.168-20.154 22.384-15.048 68.401a10.838 10.838 0 01-2.626 8.568 9.316 9.316 0 01-7.127 3.208H37.852a10.42 10.42 0 00-10.42 10.421c0 159.895 116.607 177.151 166.73 177.151 129.072 0 218.793-78.405 257.954-147.494 51.603-8.233 73.133-43.642 74.07-45.184a10.442 10.442 0 00-3.355-14.088c-1.438-.938-31.22-19.736-59.377-15.255-6.815-28.532-32.991-46.31-34.283-47.165a10.4 10.4 0 00-6.911-1.703zM132.494 544.646a20.841 20.841 0 0120.84 20.84 20.841 20.841 0 01-20.84 20.843 20.841 20.841 0 01-20.842-20.842 20.841 20.841 0 0120.842-20.84z" fill="#fff"/><path d="M23.77 11.079c-.069-.045-1.498-.947-2.849-.732-.327-1.369-1.583-2.222-1.645-2.263a.499.499 0 00-.638.069c-.1.104-.967 1.074-.722 3.282a.52.52 0 01-.126.411.447.447 0 01-.342.154H17V9.5a.5.5 0 00-.5-.5H14V3.5a.5.5 0 00-.5-.5h-3a.5.5 0 00-.5.5V6H4.5a.5.5 0 00-.5.5V9H1.5a.5.5 0 00-.5.5V12H.5a.5.5 0 00-.5.5C0 20.172 5.595 21 8 21c6.193 0 10.498-3.762 12.377-7.077 2.476-.395 3.509-2.094 3.554-2.168a.501.501 0 00-.161-.676z" fill="url(#a)" transform="matrix(20.84137 0 0 20.84137 27.432 232.025)"/></svg>

Before

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -0,0 +1 @@
<svg viewBox="20 244 512 512" xmlns="http://www.w3.org/2000/svg"><path d="M122 490h172l70-27a10 10 0 0 0 6-12l-55-146a10 10 0 0 0-13-5L90 380a10 10 0 0 0-6 12z" fill="#f3ac47"/><path d="m294 490 70-27a10 10 0 0 0 5-5l-149-54-46 86z" fill="#f19a3d"/><path d="m84 387 150 53 75-140a10 10 0 0 0-7 0L90 380a10 10 0 0 0-6 6z" fill="#ffd15c"/><g><path d="M523 462c-1-1-31-20-59-15-7-29-33-47-35-48-4-3-9-2-13 1-2 3-20 23-16 69 1 3 0 7-2 9-1 2-4 3-7 3H36.6c-2.6 0-5.4 1-7.6 3-2 2-3 5-3 8 0 160 117 177 168 177 129 0 219-78 258-148 52-8 74-43 75-45 3-5 1-11-4-14z" fill="#303c42"/><path d="M445 501c-4 1-7 3-8 6-35 65-120 142-243 142-54 0-142-20-147-147h344c9 0 17-4 23-10 6-7 9-16 8-25-2-21 1-35 4-43 8 7 19 20 19 36 0 4 1 7 5 9 3 2 6 2 10 1 12-7 30-1 42 4-9 10-27 24-57 27z" fill="#42a5f5"/><path d="M445 491c-4 0-7 2-8 5-35 66-120 142-243 142-52 0-137-18-146-136h-1c5 127 93 147 147 147 123 0 208-77 243-142 1-3 4-5 8-6 30-3 48-17 57-27-3-1-5-2-8-3-10 8-26 17-49 20z" opacity=".1"/><circle cx="132" cy="565" r="21" fill="#303c42"/><circle cx="141" cy="559" r="6.76" fill="#fff"/></g></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1 +0,0 @@
<svg viewBox="20.7 244.9 512 512" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke-miterlimit="10"><path d="M121.45 489.894h172.28l70.397-26.729a9.607 9.607 0 005.57-12.392l-55.205-145.417a9.604 9.604 0 00-12.392-5.57L90.106 380.273a9.604 9.604 0 00-5.567 12.392z" fill="#f3ac47"/><path d="M293.732 489.894l70.403-26.729a9.552 9.552 0 005.21-4.793L220.26 403.646l-46.37 86.248z" fill="#f19a3d"/><path d="M84.383 386.421l149.6 53.37 75.2-139.88a9.549 9.549 0 00-7.08-.125l-211.994 80.49a9.541 9.541 0 00-5.726 6.145z" fill="#ffd15c"/></g><g transform="matrix(20.9196 0 0 20.9196 26.176 230.103)"><path d="M23.77 11.079c-.069-.045-1.498-.947-2.849-.732-.327-1.369-1.583-2.222-1.645-2.263a.499.499 0 00-.638.069c-.1.104-.967 1.074-.722 3.282a.52.52 0 01-.126.411.447.447 0 01-.342.154H.5a.5.5 0 00-.5.5C0 20.172 5.595 21 8 21c6.193 0 10.498-3.762 12.377-7.077 2.476-.395 3.509-2.094 3.554-2.168a.501.501 0 00-.161-.676z" fill="#303c42"/><path d="M20.002 12.965a.5.5 0 00-.382.261C17.942 16.351 13.891 20 8 20c-2.546 0-6.772-.924-6.991-7h16.439c.422 0 .809-.173 1.089-.486.287-.321.424-.754.375-1.189-.113-1.02.053-1.687.214-2.069.375.361.874.985.874 1.744 0 .173.09.334.237.426a.503.503 0 00.486.021c.595-.3 1.44-.048 2.015.212-.432.455-1.301 1.138-2.736 1.306z" fill="#42a5f5"/><path d="M20.002 12.465a.5.5 0 00-.382.261C17.942 15.851 13.891 19.5 8 19.5c-2.472 0-6.518-.886-6.951-6.5h-.04c.218 6.076 4.445 7 6.991 7 5.892 0 9.942-3.649 11.62-6.774a.5.5 0 01.382-.261c1.436-.168 2.305-.851 2.736-1.306a4.894 4.894 0 00-.384-.15c-.492.399-1.254.827-2.352.956z" opacity=".1"/><circle cx="5.041" cy="16" r="1" fill="#303c42"/><circle cx="5.469" cy="15.729" r=".323" fill="#fff"/><path d="M23.77 11.079c-.069-.045-1.498-.947-2.849-.732-.327-1.369-1.583-2.222-1.645-2.263a.499.499 0 00-.638.069c-.1.104-.967 1.074-.722 3.282a.52.52 0 01-.126.411.447.447 0 01-.342.154H17V9.5a.5.5 0 00-.5-.5H14V3.5a.5.5 0 00-.5-.5h-3a.5.5 0 00-.5.5V6H4.5a.5.5 0 00-.5.5V9H1.5a.5.5 0 00-.5.5V12H.5a.5.5 0 00-.5.5C0 20.172 5.595 21 8 21c6.193 0 10.498-3.762 12.377-7.077 2.476-.395 3.509-2.094 3.554-2.168a.501.501 0 00-.161-.676z" fill="url(#a)"/></g><path d="M23.77 11.079c-.069-.045-1.498-.947-2.849-.732-.327-1.369-1.583-2.222-1.645-2.263a.499.499 0 00-.638.069c-.1.104-.967 1.074-.722 3.282a.52.52 0 01-.126.411.447.447 0 01-.342.154H17V9.5a.5.5 0 00-.5-.5H14V3.5a.5.5 0 00-.5-.5h-3a.5.5 0 00-.5.5V6H4.5a.5.5 0 00-.5.5V9H1.5a.5.5 0 00-.5.5V12H.5a.5.5 0 00-.5.5C0 20.172 5.595 21 8 21c6.193 0 10.498-3.762 12.377-7.077 2.476-.395 3.509-2.094 3.554-2.168a.501.501 0 00-.161-.676z" fill="url(#a)" transform="matrix(20.84137 0 0 20.84137 27.432 232.025)"/></svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

View File

@ -1,109 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
height="512"
viewBox="20.7 244.9 512 512"
width="512"
version="1.1"
id="svg10"
sodipodi:docname="dmo-logo-white.svg"
inkscape:version="1.1-alpha (91d7437e58, 2021-02-12, custom)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview155"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
objecttolerance="10.0"
gridtolerance="10.0"
guidetolerance="10.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="1.5996094"
inkscape:cx="185.04518"
inkscape:cy="256.31258"
inkscape:window-width="1920"
inkscape:window-height="1005"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg10" />
<defs
id="defs14">
<linearGradient
id="linearGradient4612">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4610" />
</linearGradient>
<linearGradient
id="linearGradient4588">
<stop
style="stop-color:#ff0000;stop-opacity:1;"
offset="0"
id="stop4586" />
</linearGradient>
<linearGradient
id="linearGradient4528">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4526" />
</linearGradient>
<linearGradient
id="linearGradient4348">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop4346" />
</linearGradient>
<filter
style="color-interpolation-filters:sRGB;"
id="filter5959"
x="0"
y="0"
width="1"
height="1">
<feColorMatrix
values="0.21 0.72 0.072 0.18 0 0.21 0.72 0.072 0.18 0 0.21 0.72 0.072 0.18 0 0 0 0 1 0 "
id="feColorMatrix5957" />
</filter>
</defs>
<g
id="g12703">
<g
fill="none"
stroke-miterlimit="10"
id="g8"
transform="matrix(2.4981995,0,0,2.4981995,29.044426,225.18359)"
style="filter:url(#filter5959)">
<path
d="m 37.133,105.617 h 68.54 L 133.68,94.983 a 3.822,3.822 0 0 0 2.216,-4.93 L 113.933,32.2 a 3.821,3.821 0 0 0 -4.93,-2.216 l -84.34,32.021 a 3.821,3.821 0 0 0 -2.215,4.93 z"
fill="#f3ac47"
id="path2" />
<path
d="m 105.674,105.617 28.009,-10.634 a 3.8,3.8 0 0 0 2.073,-1.907 L 76.443,71.304 57.995,105.617 Z"
fill="#f19a3d"
id="path4-5" />
<path
d="m 22.386,64.451 59.517,21.233 29.918,-55.65 a 3.799,3.799 0 0 0 -2.817,-0.05 l -84.34,32.022 a 3.796,3.796 0 0 0 -2.278,2.445 z"
fill="#ffd15c"
id="path6" />
</g>
<path
id="path10"
style="stroke-width:21.581;fill:#ffffff;fill-opacity:1"
d="m 418.52031,389.19102 a 10.768909,10.768909 0 0 0 -6.61328,3.25195 c -2.1581,2.24442 -20.86937,23.17732 -15.58203,70.82812 a 11.22211,11.22211 0 0 1 -2.71875,8.8711 9.6466981,9.6466981 0 0 1 -7.38086,3.32226 H 20.471484 A 10.79049,10.79049 0 0 0 9.680469,486.25547 c 0,165.56928 120.746181,183.4375 172.648441,183.4375 133.65101,0 226.55676,-81.18757 267.10742,-152.72852 53.4345,-8.52448 75.72807,-45.19011 76.69922,-46.78711 a 10.812071,10.812071 0 0 0 -3.47461,-14.58789 c -1.48909,-0.97114 -32.32847,-20.43678 -61.48438,-15.79687 -7.05698,-29.54436 -34.16198,-47.95307 -35.5,-48.83789 a 10.768909,10.768909 0 0 0 -7.15625,-1.76367 z M 118.47148,540.20859 a 21.58098,21.58098 0 0 1 21.58008,21.58008 21.58098,21.58098 0 0 1 -21.58008,21.58203 21.58098,21.58098 0 0 1 -21.582027,-21.58203 21.58098,21.58098 0 0 1 21.582027,-21.58008 z"
transform="matrix(0.96572879,0,0,0.96572879,18.08261,22.951217)" />
</g>
<path
d="M 23.77,11.079 C 23.701,11.034 22.272,10.132 20.921,10.347 20.594,8.978 19.338,8.125 19.276,8.084 a 0.499,0.499 0 0 0 -0.638,0.069 c -0.1,0.104 -0.967,1.074 -0.722,3.282 A 0.52,0.52 0 0 1 17.79,11.846 0.447,0.447 0 0 1 17.448,12 H 17 V 9.5 A 0.5,0.5 0 0 0 16.5,9 H 14 V 3.5 A 0.5,0.5 0 0 0 13.5,3 h -3 A 0.5,0.5 0 0 0 10,3.5 V 6 H 4.5 A 0.5,0.5 0 0 0 4,6.5 V 9 H 1.5 A 0.5,0.5 0 0 0 1,9.5 V 12 H 0.5 A 0.5,0.5 0 0 0 0,12.5 c 0,7.672 5.595,8.5 8,8.5 6.193,0 10.498,-3.762 12.377,-7.077 2.476,-0.395 3.509,-2.094 3.554,-2.168 A 0.501,0.501 0 0 0 23.77,11.079 Z"
fill="url(#a)"
id="path20"
transform="matrix(20.841374,0,0,20.841374,27.431789,232.02503)" />
</svg>

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

View File

@ -1,126 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
height="512"
viewBox="20.7 244.9 512 512"
width="512"
version="1.1"
id="svg10"
sodipodi:docname="dmo-logo.svg"
inkscape:version="1.1-alpha (91d7437e58, 2021-02-12, custom)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview33"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
objecttolerance="10.0"
gridtolerance="10.0"
guidetolerance="10.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="1.5996094"
inkscape:cx="195.04762"
inkscape:cy="256.31258"
inkscape:window-width="1920"
inkscape:window-height="1005"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg10" />
<defs
id="defs14">
<linearGradient
id="linearGradient4612">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4610" />
</linearGradient>
<linearGradient
id="linearGradient4588">
<stop
style="stop-color:#ff0000;stop-opacity:1;"
offset="0"
id="stop4586" />
</linearGradient>
<linearGradient
id="linearGradient4528">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4526" />
</linearGradient>
<linearGradient
id="linearGradient4348">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop4346" />
</linearGradient>
</defs>
<g
id="g12293">
<g
fill="none"
stroke-miterlimit="10"
id="g8-7"
transform="matrix(2.5135595,0,0,2.5135595,28.114541,224.41955)"
style="opacity:1">
<path
d="m 37.133,105.617 h 68.54 L 133.68,94.983 a 3.822,3.822 0 0 0 2.216,-4.93 L 113.933,32.2 a 3.821,3.821 0 0 0 -4.93,-2.216 l -84.34,32.021 a 3.821,3.821 0 0 0 -2.215,4.93 z"
fill="#f3ac47"
id="path2-3" />
<path
d="m 105.674,105.617 28.009,-10.634 a 3.8,3.8 0 0 0 2.073,-1.907 L 76.443,71.304 57.995,105.617 Z"
fill="#f19a3d"
id="path4" />
<path
d="m 22.386,64.451 59.517,21.233 29.918,-55.65 a 3.799,3.799 0 0 0 -2.817,-0.05 l -84.34,32.022 a 3.796,3.796 0 0 0 -2.278,2.445 z"
fill="#ffd15c"
id="path6-6" />
</g>
<g
transform="matrix(20.919594,0,0,20.919594,26.175505,230.10256)"
id="g22"
style="opacity:1">
<path
d="M 23.77,11.079 C 23.701,11.034 22.272,10.132 20.921,10.347 20.594,8.978 19.338,8.125 19.276,8.084 a 0.499,0.499 0 0 0 -0.638,0.069 c -0.1,0.104 -0.967,1.074 -0.722,3.282 A 0.52,0.52 0 0 1 17.79,11.846 0.447,0.447 0 0 1 17.448,12 H 0.5 A 0.5,0.5 0 0 0 0,12.5 c 0,7.672 5.595,8.5 8,8.5 6.193,0 10.498,-3.762 12.377,-7.077 2.476,-0.395 3.509,-2.094 3.554,-2.168 A 0.501,0.501 0 0 0 23.77,11.079 Z"
fill="#303c42"
id="path10-5" />
<path
d="M 20.002,12.965 A 0.5,0.5 0 0 0 19.62,13.226 C 17.942,16.351 13.891,20 8,20 5.454,20 1.228,19.076 1.009,13 h 16.439 c 0.422,0 0.809,-0.173 1.089,-0.486 0.287,-0.321 0.424,-0.754 0.375,-1.189 -0.113,-1.02 0.053,-1.687 0.214,-2.069 C 19.501,9.617 20,10.241 20,11 c 0,0.173 0.09,0.334 0.237,0.426 a 0.503,0.503 0 0 0 0.486,0.021 c 0.595,-0.3 1.44,-0.048 2.015,0.212 -0.432,0.455 -1.301,1.138 -2.736,1.306 z"
fill="#42a5f5"
id="path12" />
<path
d="M 20.002,12.465 A 0.5,0.5 0 0 0 19.62,12.726 C 17.942,15.851 13.891,19.5 8,19.5 5.528,19.5 1.482,18.614 1.049,13 h -0.04 c 0.218,6.076 4.445,7 6.991,7 5.892,0 9.942,-3.649 11.62,-6.774 a 0.5,0.5 0 0 1 0.382,-0.261 c 1.436,-0.168 2.305,-0.851 2.736,-1.306 a 4.894,4.894 0 0 0 -0.384,-0.15 c -0.492,0.399 -1.254,0.827 -2.352,0.956 z"
opacity="0.1"
id="path14" />
<circle
cx="5.0409999"
cy="16"
r="1"
fill="#303c42"
id="circle16" />
<circle
cx="5.4689999"
cy="15.729"
r="0.32300001"
fill="#ffffff"
id="circle18" />
<path
d="M 23.77,11.079 C 23.701,11.034 22.272,10.132 20.921,10.347 20.594,8.978 19.338,8.125 19.276,8.084 a 0.499,0.499 0 0 0 -0.638,0.069 c -0.1,0.104 -0.967,1.074 -0.722,3.282 A 0.52,0.52 0 0 1 17.79,11.846 0.447,0.447 0 0 1 17.448,12 H 17 V 9.5 A 0.5,0.5 0 0 0 16.5,9 H 14 V 3.5 A 0.5,0.5 0 0 0 13.5,3 h -3 A 0.5,0.5 0 0 0 10,3.5 V 6 H 4.5 A 0.5,0.5 0 0 0 4,6.5 V 9 H 1.5 A 0.5,0.5 0 0 0 1,9.5 V 12 H 0.5 A 0.5,0.5 0 0 0 0,12.5 c 0,7.672 5.595,8.5 8,8.5 6.193,0 10.498,-3.762 12.377,-7.077 2.476,-0.395 3.509,-2.094 3.554,-2.168 A 0.501,0.501 0 0 0 23.77,11.079 Z"
fill="url(#a)"
id="path20-6" />
</g>
</g>
<path
d="M 23.77,11.079 C 23.701,11.034 22.272,10.132 20.921,10.347 20.594,8.978 19.338,8.125 19.276,8.084 a 0.499,0.499 0 0 0 -0.638,0.069 c -0.1,0.104 -0.967,1.074 -0.722,3.282 A 0.52,0.52 0 0 1 17.79,11.846 0.447,0.447 0 0 1 17.448,12 H 17 V 9.5 A 0.5,0.5 0 0 0 16.5,9 H 14 V 3.5 A 0.5,0.5 0 0 0 13.5,3 h -3 A 0.5,0.5 0 0 0 10,3.5 V 6 H 4.5 A 0.5,0.5 0 0 0 4,6.5 V 9 H 1.5 A 0.5,0.5 0 0 0 1,9.5 V 12 H 0.5 A 0.5,0.5 0 0 0 0,12.5 c 0,7.672 5.595,8.5 8,8.5 6.193,0 10.498,-3.762 12.377,-7.077 2.476,-0.395 3.509,-2.094 3.554,-2.168 A 0.501,0.501 0 0 0 23.77,11.079 Z"
fill="url(#a)"
id="path20"
transform="matrix(20.841374,0,0,20.841374,27.431789,232.02503)" />
</svg>

Before

Width:  |  Height:  |  Size: 5.6 KiB

View File

@ -20,13 +20,14 @@ docs_dir: 'content/'
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Choosing_between_www_and_non-www_URLs#using_%3Clink_relcanonical%3E
# Also required for `sitemap.xml` generation at build time; which bots use to assist them crawling and indexing a website,
# the `mkdocs-material` 'Instant Navigation' feature utilizes the sitemap data to work.
site_url: 'https://docker-mailserver.github.io/docker-mailserver/edge'
site_url: 'https://docker-mailserver.github.io/docker-mailserver/edge/'
# Anything related to the `mkdocs-material` theme config goes here:
theme:
name: 'material'
custom_dir: 'overrides/'
favicon: assets/logo/favicon-32x32.png
logo: assets/logo/dmo-logo-white.svg
logo: assets/logo/dmo-logo-white.min.svg
icon:
repo: fontawesome/brands/github
features:
@ -36,7 +37,7 @@ theme:
- navigation.instant
palette:
# Light mode
- media: "(prefers-color-scheme: light)"
- media: '(prefers-color-scheme: light)'
scheme: default
primary: indigo
accent: indigo
@ -44,7 +45,7 @@ theme:
icon: material/weather-night
name: Switch to dark mode
# Dark mode
- media: "(prefers-color-scheme: dark)"
- media: '(prefers-color-scheme: dark)'
scheme: slate
primary: indigo
accent: blue

1
docs/overrides/404.html Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

BIN
docs/overrides/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB