From 57520c3d7d103e5e4dff2fbab40a6067f386ecf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melissa=20Weber=20Mendon=C3=A7a?= Date: Mon, 15 Jul 2024 12:02:14 -0300 Subject: [PATCH 1/3] Fix footer display --- napari_sphinx_theme/footer.html | 30 +++++++++++++++---- napari_sphinx_theme/layout.html | 7 +++++ napari_sphinx_theme/napari-layout.html | 23 -------------- .../static/css/napari-sphinx-theme.css | 19 ++++++++++-- napari_sphinx_theme/theme.conf | 6 +++- 5 files changed, 53 insertions(+), 32 deletions(-) create mode 100644 napari_sphinx_theme/layout.html delete mode 100644 napari_sphinx_theme/napari-layout.html diff --git a/napari_sphinx_theme/footer.html b/napari_sphinx_theme/footer.html index 562280cf..323864da 100644 --- a/napari_sphinx_theme/footer.html +++ b/napari_sphinx_theme/footer.html @@ -1,7 +1,25 @@ - + {% endif %} + {% if theme_footer_center %} +
+ {% for item in theme_footer_center %} +
{% include item %}
+ {% endfor %} +
+ {% endif %} + {% if theme_footer_end %} +
+ {% for item in theme_footer_end %} +
{% include item %}
+ {% endfor %} +
+ {% endif %} + +{% endif %} diff --git a/napari_sphinx_theme/layout.html b/napari_sphinx_theme/layout.html new file mode 100644 index 00000000..d6052a82 --- /dev/null +++ b/napari_sphinx_theme/layout.html @@ -0,0 +1,7 @@ +{%- extends "pydata_sphinx_theme/layout.html" %} + +{%- block footer %} + +{%- endblock %} diff --git a/napari_sphinx_theme/napari-layout.html b/napari_sphinx_theme/napari-layout.html deleted file mode 100644 index b9540743..00000000 --- a/napari_sphinx_theme/napari-layout.html +++ /dev/null @@ -1,23 +0,0 @@ -{%- extends "pydata_sphinx_theme/layout.html" %} - -{%- block extrahead %} - - - {% for favicon in theme_favicons %} - {% if favicon.href[:4] == 'http'%} - - {% else %} - - {% endif %} - {% endfor %} -{%- endblock %} - -{% block content %} - - {{ super() }} - -{%- endblock %} - -{%- block footer %} -{%- include "footer.html" %} -{%- endblock %} diff --git a/napari_sphinx_theme/static/css/napari-sphinx-theme.css b/napari_sphinx_theme/static/css/napari-sphinx-theme.css index 01740246..bdeaa8e9 100644 --- a/napari_sphinx_theme/static/css/napari-sphinx-theme.css +++ b/napari_sphinx_theme/static/css/napari-sphinx-theme.css @@ -83,8 +83,6 @@ h1 { align-items: center; justify-content: space-between; background-color: black; - padding-left: 1.5rem; - padding-right: 1.5rem; padding-top: 1.5rem; padding-bottom: 0.5rem; margin-top: 75px; @@ -206,6 +204,23 @@ h1 { display: block; } +/* Recommended by PST */ +.footer-items__start, .footer-items__end { + flex-direction: row; +} + +.bd-footer__inner { + display: flex; + flex-shrink: 0; + flex-direction: row; + flex-wrap: wrap; + width: 100%; + max-width: 100%; + align-items: center; + justify-content: space-between; + background-color: black; +} + /**************************** Nav bar section *****************************/ diff --git a/napari_sphinx_theme/theme.conf b/napari_sphinx_theme/theme.conf index 70d6707a..fe5a2993 100644 --- a/napari_sphinx_theme/theme.conf +++ b/napari_sphinx_theme/theme.conf @@ -20,5 +20,9 @@ navbar_align = content navbar_start = navbar-logo.html navbar_center = navbar-nav.html navbar_end = navbar-icon-links.html -footer_items = napari-footer-links.html, napari-copyright.html page_sidebar_items = page-toc.html +article_footer_items = +content_footer_items = +footer_start = napari-footer-links.html +footer_center = +footer_end = napari-copyright.html \ No newline at end of file From 493df99a21b7ac55f83df81ec25a8d4c025ea540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melissa=20Weber=20Mendon=C3=A7a?= Date: Mon, 15 Jul 2024 15:16:31 -0300 Subject: [PATCH 2/3] Change wording on footer items --- napari_sphinx_theme/napari-footer-links.html | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/napari_sphinx_theme/napari-footer-links.html b/napari_sphinx_theme/napari-footer-links.html index 472b5511..9ac049b7 100644 --- a/napari_sphinx_theme/napari-footer-links.html +++ b/napari_sphinx_theme/napari-footer-links.html @@ -1,40 +1,40 @@ - + {% include "partials/napari.html" %} napari - + {% include "partials/napari-hub.html" %} {% include "partials/napari-hub-light-blue.html" %} - napari hub + Plugins - + {% include "partials/github.html" %} {% include "partials/github-light-blue.html" %} - GitHub + Code - + {% include "partials/mastodon.html" %} {% include "partials/mastodon-light-blue.html" %} Mastodon - + {% include "partials/twitter.html" %} {% include "partials/twitter-light-blue.html" %} Twitter - + {% include "partials/image-sc.html" %} {% include "partials/image-sc-light-blue.html" %} - image.sc + Ask a question - + {% include "partials/zulip.html" %} {% include "partials/zulip-light-blue.html" %} - Zulip + Chat From 125fc43cf36d5eb1939b75615abea16b9bfb7ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melissa=20Weber=20Mendon=C3=A7a?= Date: Thu, 18 Jul 2024 09:57:36 -0300 Subject: [PATCH 3/3] Update caption to image.sc to say Forum --- napari_sphinx_theme/napari-footer-links.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/napari_sphinx_theme/napari-footer-links.html b/napari_sphinx_theme/napari-footer-links.html index 9ac049b7..80587f94 100644 --- a/napari_sphinx_theme/napari-footer-links.html +++ b/napari_sphinx_theme/napari-footer-links.html @@ -30,7 +30,7 @@ {% include "partials/image-sc.html" %} {% include "partials/image-sc-light-blue.html" %} - Ask a question + Forum