Merge the two themes

Qiskit · Dec 5, 2023 · 35a7790 · 35a7790
1 parent bb08fb7
commit 35a7790
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 51 deletions.
diff --git a/src/qiskit_sphinx_theme/__init__.py b/src/qiskit_sphinx_theme/__init__.py
@@ -86,7 +86,7 @@ def setup(app: sphinx.application.Sphinx) -> dict[str, bool]:
     translations.setup(app)
 
     app.add_html_theme("qiskit", _get_theme_absolute_path("theme/qiskit-sphinx-theme"))
-    app.add_html_theme("qiskit-ecosystem", _get_theme_absolute_path("ecosystem"))
+    app.add_html_theme("qiskit-ecosystem", _get_theme_absolute_path("theme/qiskit-sphinx-theme"))
 
     app.connect("config-inited", activate_furo)
     app.connect("html-page-context", remove_thebe_if_not_needed)

diff --git a/src/qiskit_sphinx_theme/assets/styles/_colors.scss b/src/qiskit_sphinx_theme/assets/styles/_colors.scss
@@ -1,5 +1,5 @@
 body {
-    // Define the Carbon color schemes from 
+    // Define the Carbon color schemes from
     // https://github.com/carbon-design-system/carbon/blob/v10/packages/colors/src/colors.js
     //
     // Projects can override `--color-brand-primary` to whatever they want.

diff --git a/src/qiskit_sphinx_theme/assets/styles/_left-sidebar.scss b/src/qiskit_sphinx_theme/assets/styles/_left-sidebar.scss
@@ -38,6 +38,17 @@ body {
   text-transform: unset;
 }
 
+
+// ------------------------------------------------------------------------------
+// Logos
+// ------------------------------------------------------------------------------
+
+// Furo only sets `max-width` to 100%, and height stays at `auto`. That results in
+// logos appearing small in the in the left sidebar.
+.sidebar-logo {
+  width: 100%;
+}
+
 // --------------------------------------------------------------------------------------
 // Common config for Translations & Previous Releases
 // --------------------------------------------------------------------------------------

diff --git a/src/qiskit_sphinx_theme/ecosystem/static/styles/qiskit-ecosystem.css b/src/qiskit_sphinx_theme/ecosystem/static/styles/qiskit-ecosystem.css
diff --git a/src/qiskit_sphinx_theme/ecosystem/theme.conf b/src/qiskit_sphinx_theme/ecosystem/theme.conf
diff --git a/...sphinx_theme/ecosystem/sidebar/brand.html → ...theme/custom_templates/sidebar_brand.html b/...sphinx_theme/ecosystem/sidebar/brand.html → ...theme/custom_templates/sidebar_brand.html
diff --git a/...cosystem/static/images/ecosystem-logo.svg → ...nx-theme/static/images/ecosystem-logo.svg b/...cosystem/static/images/ecosystem-logo.svg → ...nx-theme/static/images/ecosystem-logo.svg
diff --git a/src/qiskit_sphinx_theme/theme/qiskit-sphinx-theme/theme.conf b/src/qiskit_sphinx_theme/theme/qiskit-sphinx-theme/theme.conf
@@ -15,9 +15,13 @@ inherit = furo
 stylesheet = styles/qiskit-sphinx-theme.css
 
 sidebars =
+  custom_templates/sidebar_brand.html,
   sidebar/search.html,
   sidebar/scroll-start.html,
   sidebar/navigation.html,
   custom_templates/sidebar_version_list.html,
   sidebar/scroll-end.html,
   custom_templates/sidebar_languages.html
+
+[options]
+disable_ecosystem_logo =
diff --git a/...it.test.js-snapshots/left-side-bar-previous-releases-are-expandable-1-linux.png b/...it.test.js-snapshots/left-side-bar-previous-releases-are-expandable-1-linux.png
diff --git a/tests/js/qiskit.test.js-snapshots/left-side-bar-renders-correctly-1-linux.png b/tests/js/qiskit.test.js-snapshots/left-side-bar-renders-correctly-1-linux.png