Skip to content

Commit

Permalink
Merge branch 'master' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
@choldgraf
choldgraf authored Apr 8, 2024
2 parents 1523380 + ad37e31 commit b1c2837
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
python -m build
- name: Publish
uses: pypa/[email protected].11
uses: pypa/[email protected].14
with:
user: __token__
password: ${{ secrets.PYPI_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: 3.11
- uses: pre-commit/[email protected].0
- uses: pre-commit/[email protected].1

tests:
continue-on-error: ${{ matrix.experimental || false }}
Expand Down
3 changes: 2 additions & 1 deletion src/sphinx_book_theme/assets/styles/sections/_header-article.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ label.sidebar-toggle.secondary-toggle {
font-size: 1.3rem;
color: var(--pst-color-text-muted);
border: none;
padding: 0 0.5rem;
padding-left: 0.5rem;
padding-right: 0.5rem;

// Make sure anything inside is aligned vertically
display: flex;
Expand Down
8 changes: 4 additions & 4 deletions src/sphinx_book_theme/header_buttons/launch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def add_launch_buttons(
{
"type": "link",
"text": "Binder",
"tooltip": translation("Launch on") + "Binder",
"tooltip": translation("Launch on") + " Binder",
"icon": "_static/images/logo_binder.svg",
"url": url,
}
Expand All @@ -152,7 +152,7 @@ def add_launch_buttons(
{
"type": "link",
"text": "JupyterHub",
"tooltip": translation("Launch on") + "JupyterHub",
"tooltip": translation("Launch on") + " JupyterHub",
"icon": "_static/images/logo_jupyterhub.svg",
"url": url,
}
Expand All @@ -167,7 +167,7 @@ def add_launch_buttons(
{
"type": "link",
"text": "Colab",
"tooltip": translation("Launch on") + "Colab",
"tooltip": translation("Launch on") + " Colab",
"icon": "_static/images/logo_colab.png",
"url": url,
}
Expand All @@ -183,7 +183,7 @@ def add_launch_buttons(
{
"type": "link",
"text": "Deepnote",
"tooltip": translation("Launch on") + "Deepnote",
"tooltip": translation("Launch on") + " Deepnote",
"icon": "_static/images/logo_deepnote.svg",
"url": url,
}
Expand Down
2 changes: 1 addition & 1 deletion src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% if icon.startswith("fa") -%}
<i class="{{ icon }}"></i>
{% else %}
<img src="{{ pathto(icon, 1) }}">
<img alt="{{ translate(text) }} {{ translate("logo") }}" src="{{ pathto(icon, 1) }}">
{% endif -%}
</span>
{% endif %}
Expand Down
16 changes: 8 additions & 8 deletions tests/test_build/build__header-article.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,39 +18,39 @@
</button>
<ul class="dropdown-menu">
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/master?urlpath=lab/tree/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch onBinder">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/master?urlpath=lab/tree/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
<span class="btn__icon-container">
<img src="../_static/images/logo_binder.svg"/>
<img alt="Binder logo" src="../_static/images/logo_binder.svg"/>
</span>
<span class="btn__text-container">
Binder
</span>
</a>
</li>
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A//github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master" target="_blank" title="Launch onJupyterHub">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A//github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master" target="_blank" title="Launch on JupyterHub">
<span class="btn__icon-container">
<img src="../_static/images/logo_jupyterhub.svg"/>
<img alt="JupyterHub logo" src="../_static/images/logo_jupyterhub.svg"/>
</span>
<span class="btn__text-container">
JupyterHub
</span>
</a>
</li>
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://colab.research.google.com/github/executablebooks/sphinx-book-theme/blob/master/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch onColab">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://colab.research.google.com/github/executablebooks/sphinx-book-theme/blob/master/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Colab">
<span class="btn__icon-container">
<img src="../_static/images/logo_colab.png"/>
<img alt="Colab logo" src="../_static/images/logo_colab.png"/>
</span>
<span class="btn__text-container">
Colab
</span>
</a>
</li>
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://deepnote.com/launch?url=https%3A%2F%2Fgithub.com%2Fexecutablebooks%2Fsphinx-book-theme%2Fblob%2Fmaster%2FTESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch onDeepnote">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://deepnote.com/launch?url=https%3A%2F%2Fgithub.com%2Fexecutablebooks%2Fsphinx-book-theme%2Fblob%2Fmaster%2FTESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Deepnote">
<span class="btn__icon-container">
<img src="../_static/images/logo_deepnote.svg"/>
<img alt="Deepnote logo" src="../_static/images/logo_deepnote.svg"/>
</span>
<span class="btn__text-container">
Deepnote
Expand Down
4 changes: 2 additions & 2 deletions tests/test_build/header__repo-buttons--custom-branch.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</button>
<ul class="dropdown-menu">
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/foo?urlpath=tree/section1/ntbk.ipynb" target="_blank" title="Launch onBinder">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/foo?urlpath=tree/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
<span class="btn__icon-container">
<img src="../_static/images/logo_binder.svg"/>
<img alt="Binder logo" src="../_static/images/logo_binder.svg"/>
</span>
<span class="btn__text-container">
Binder
Expand Down
16 changes: 8 additions & 8 deletions tests/test_build/test_header_launchbtns.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,39 @@
</button>
<ul class="dropdown-menu">
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/master?urlpath=lab/tree/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch onBinder">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/master?urlpath=lab/tree/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
<span class="btn__icon-container">
<img src="../_static/images/logo_binder.svg"/>
<img alt="Binder logo" src="../_static/images/logo_binder.svg"/>
</span>
<span class="btn__text-container">
Binder
</span>
</a>
</li>
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A//github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master" target="_blank" title="Launch onJupyterHub">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A//github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master" target="_blank" title="Launch on JupyterHub">
<span class="btn__icon-container">
<img src="../_static/images/logo_jupyterhub.svg"/>
<img alt="JupyterHub logo" src="../_static/images/logo_jupyterhub.svg"/>
</span>
<span class="btn__text-container">
JupyterHub
</span>
</a>
</li>
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://colab.research.google.com/github/executablebooks/sphinx-book-theme/blob/master/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch onColab">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://colab.research.google.com/github/executablebooks/sphinx-book-theme/blob/master/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Colab">
<span class="btn__icon-container">
<img src="../_static/images/logo_colab.png"/>
<img alt="Colab logo" src="../_static/images/logo_colab.png"/>
</span>
<span class="btn__text-container">
Colab
</span>
</a>
</li>
<li>
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://deepnote.com/launch?url=https%3A%2F%2Fgithub.com%2Fexecutablebooks%2Fsphinx-book-theme%2Fblob%2Fmaster%2FTESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch onDeepnote">
<a class="btn btn-sm dropdown-item" data-bs-placement="left" data-bs-toggle="tooltip" href="https://deepnote.com/launch?url=https%3A%2F%2Fgithub.com%2Fexecutablebooks%2Fsphinx-book-theme%2Fblob%2Fmaster%2FTESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Deepnote">
<span class="btn__icon-container">
<img src="../_static/images/logo_deepnote.svg"/>
<img alt="Deepnote logo" src="../_static/images/logo_deepnote.svg"/>
</span>
<span class="btn__text-container">
Deepnote
Expand Down

0 comments on commit b1c2837

Please sign in to comment.