Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Publish Docs
on:
push:
branches: ["main"]
tags:
- 'v*'
workflow_dispatch:

env:
Expand All @@ -13,7 +11,6 @@ env:

permissions:
contents: write

jobs:
publish-docs:
runs-on: ubuntu-latest
Expand All @@ -26,6 +23,7 @@ jobs:
with:
key: ${{ github.ref }}
path: .cache
# for now, only install mkdocs. In the future may need to install Marvin itself.
- name: Install dependencies for MKDocs Material
run: pip install \
mkdocs-material \
Expand All @@ -35,14 +33,6 @@ jobs:
mkdocs-markdownextradata-plugin \
mkdocs-jupyter \
pillow \
cairosvg \
mike
- name: Publish docs from `main` to dev
if: github.ref == 'refs/heads/main'
run: mike deploy dev --push --update-aliases

- name: Publish versioned docs
if: startsWith(github.ref, 'refs/tags/v')
run: |
VERSION=$(echo $GITHUB_REF | sed 's/refs\/tags\/v//')
mike deploy $VERSION latest --push --update-aliases
cairosvg
- name: Publish docs
run: mkdocs gh-deploy --force
10 changes: 4 additions & 6 deletions docs/static/css/tailwind.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
! tailwindcss v3.3.6 | MIT License | https://tailwindcss.com
! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
*/

/*
Expand Down Expand Up @@ -121,10 +121,8 @@ strong {
}

/*
1. Use the user's configured `mono` font-family by default.
2. Use the user's configured `mono` font-feature-settings by default.
3. Use the user's configured `mono` font-variation-settings by default.
4. Correct the odd `em` font sizing in all browsers.
1. Use the user's configured `mono` font family by default.
2. Correct the odd `em` font sizing in all browsers.
*/

code,
Expand All @@ -134,7 +132,7 @@ pre {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
/* 1 */
font-size: 1em;
/* 4 */
/* 2 */
}

/*
Expand Down
4 changes: 1 addition & 3 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ extra:
link: https://discord.gg/Kgw4HpcuYG
- icon: fontawesome/brands/twitter
link: https://twitter.com/askmarvinai
version:
mike:
canonical_version: latest


extra_css:
- /static/css/global.css
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ dev = [
"marvin[tests]",
"black[jupyter]",
"ipython",
"mike @ git+https://github.com/jimporter/mike.git",
"mkdocs-autolinks-plugin~=0.7",
"mkdocs-awesome-pages-plugin~=2.8",
"mkdocs-markdownextradata-plugin~=0.2",
Expand Down