From b8e6bf880c1d694ab04f77fdfe83c8d6a47845b6 Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:03:26 +0000 Subject: [PATCH 1/6] fix: put the btt button closer to age bottom --- src/pydata_sphinx_theme/assets/styles/base/_base.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pydata_sphinx_theme/assets/styles/base/_base.scss b/src/pydata_sphinx_theme/assets/styles/base/_base.scss index efa349103..345de1333 100644 --- a/src/pydata_sphinx_theme/assets/styles/base/_base.scss +++ b/src/pydata_sphinx_theme/assets/styles/base/_base.scss @@ -172,7 +172,7 @@ pre { z-index: $zindex-tooltip; position: fixed; display: none; - top: 80vh; + top: 90vh; left: 50vw; transform: translate(-50%); color: var(--pst-color-secondary-text); From 9b37a2d00b7af9b08e3099e8f2bf539f687d0b20 Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:23:51 +0000 Subject: [PATCH 2/6] test: remove the btt button to check --- docs/conf.py | 1 + package-lock.json | 8 ++++---- .../theme/pydata_sphinx_theme/layout.html | 2 ++ .../theme/pydata_sphinx_theme/theme.conf | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index b2c0771d3..542946d2c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -189,6 +189,7 @@ "version_match": version_match, }, "navigation_with_keys": False, + "back_to_top_button": False, # "search_bar_position": "navbar", # TODO: Deprecated - remove in future version } diff --git a/package-lock.json b/package-lock.json index 4bfd86d72..294f6bbb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "pydata_sphinx_theme", "dependencies": { - "@fortawesome/fontawesome-free": "6.1.2", + "@fortawesome/fontawesome-free": "6.5.1", "@popperjs/core": "^2.11.6", "bootstrap": "^5.2.2", "compare-versions": "^5.0.3" @@ -3652,9 +3652,9 @@ "dev": true }, "@fortawesome/fontawesome-free": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.2.tgz", - "integrity": "sha512-XwWADtfdSN73/udaFm+1mnGIj/ShDZNFMe/PRoqv3FhQ4GNI2PUN70yFTPsjq65Lw2C9i4TG5/hTbxXIXVCiqQ==" + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz", + "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==" }, "@jest/schemas": { "version": "29.6.3", diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html index 13ea08afd..b5024fd06 100644 --- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html +++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html @@ -43,11 +43,13 @@ {# A tiny helper pixel to detect if we've scrolled #}
+ {%- if back_to_top_button %} {# the scroll to top button #} + {%- endif %} {# checkbox to toggle primary sidebar #} Date: Wed, 3 Jan 2024 18:28:25 +0000 Subject: [PATCH 3/6] test: fallback to default behaviour --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 542946d2c..3be8e45eb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -189,7 +189,7 @@ "version_match": version_match, }, "navigation_with_keys": False, - "back_to_top_button": False, + # "back_to_top_button": False, # "search_bar_position": "navbar", # TODO: Deprecated - remove in future version } From 1048c2edbff75648629d041b16fa5260617c26c9 Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:34:11 +0000 Subject: [PATCH 4/6] refactor: rollback to previous state --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 294f6bbb6..4bfd86d72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "pydata_sphinx_theme", "dependencies": { - "@fortawesome/fontawesome-free": "6.5.1", + "@fortawesome/fontawesome-free": "6.1.2", "@popperjs/core": "^2.11.6", "bootstrap": "^5.2.2", "compare-versions": "^5.0.3" @@ -3652,9 +3652,9 @@ "dev": true }, "@fortawesome/fontawesome-free": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz", - "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==" + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.2.tgz", + "integrity": "sha512-XwWADtfdSN73/udaFm+1mnGIj/ShDZNFMe/PRoqv3FhQ4GNI2PUN70yFTPsjq65Lw2C9i4TG5/hTbxXIXVCiqQ==" }, "@jest/schemas": { "version": "29.6.3", From e3bdfe55d718aa825e9d23fb6042d0ba6d3d3996 Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:58:06 +0100 Subject: [PATCH 5/6] use proper variable name --- src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html index b5024fd06..c4876fb34 100644 --- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html +++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html @@ -43,7 +43,7 @@ {# A tiny helper pixel to detect if we've scrolled #}
- {%- if back_to_top_button %} + {%- if html_back_to_top_button %} {# the scroll to top button #}