From 15f2fa3fc842fd806029c7d63594cd1daf47c4e1 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Mon, 12 Apr 2021 14:02:34 -0500 Subject: [PATCH 01/11] cruft --- doc/_static/copybutton.js | 66 --------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 doc/_static/copybutton.js diff --git a/doc/_static/copybutton.js b/doc/_static/copybutton.js deleted file mode 100644 index 01ee2bab36b..00000000000 --- a/doc/_static/copybutton.js +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2014 PSF. Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -// File originates from the cpython source found in Doc/tools/sphinxext/static/copybutton.js - -$(document).ready(function() { - /* Add a [>>>] button on the top-right corner of code samples to hide - * the >>> and ... prompts and the output and thus make the code - * copyable. */ - var div = $('.highlight-python .highlight,' + - '.highlight-default .highlight,' + - '.highlight-python3 .highlight') - var pre = div.find('pre'); - - // get the styles from the current theme - pre.parent().parent().css('position', 'relative'); - var hide_text = 'Hide the prompts and output'; - var show_text = 'Show the prompts and output'; - var border_width = pre.css('border-top-width'); - var border_style = pre.css('border-top-style'); - var border_color = pre.css('border-top-color'); - var button_styles = { - 'cursor':'pointer', 'position': 'absolute', 'top': '0', 'right': '0', - 'border-color': border_color, 'border-style': border_style, - 'border-width': border_width, 'color': border_color, 'text-size': '75%', - 'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em', - 'border-radius': '0 3px 0 0' - } - - // create and add the button to all the code blocks that contain >>> - div.each(function(index) { - var jthis = $(this); - if (jthis.find('.gp').length > 0) { - var button = $('>>>'); - button.css(button_styles) - button.attr('title', hide_text); - button.data('hidden', 'false'); - jthis.prepend(button); - } - // tracebacks (.gt) contain bare text elements that need to be - // wrapped in a span to work with .nextUntil() (see later) - jthis.find('pre:has(.gt)').contents().filter(function() { - return ((this.nodeType == 3) && (this.data.trim().length > 0)); - }).wrap(''); - }); - - // define the behavior of the button when it's clicked - $('.copybutton').click(function(e){ - e.preventDefault(); - var button = $(this); - if (button.data('hidden') === 'false') { - // hide the code output - button.parent().find('.go, .gp, .gt').hide(); - button.next('pre').find('.gt').nextUntil('.gp, .go').css('visibility', 'hidden'); - button.css('text-decoration', 'line-through'); - button.attr('title', show_text); - button.data('hidden', 'true'); - } else { - // show the code output - button.parent().find('.go, .gp, .gt').show(); - button.next('pre').find('.gt').nextUntil('.gp, .go').css('visibility', 'visible'); - button.css('text-decoration', 'none'); - button.attr('title', hide_text); - button.data('hidden', 'false'); - } - }); -}); - From 7cbb7705d27f369835e81f959ef49aec29d74847 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Mon, 12 Apr 2021 14:04:16 -0500 Subject: [PATCH 02/11] refactor templates for new theme version; restyle version switcher --- doc/_templates/homepage.html | 42 +++++++++++++ doc/_templates/layout.html | 59 ++----------------- ...docs-navbar.html => version-switcher.html} | 13 +--- doc/conf.py | 1 + 4 files changed, 52 insertions(+), 63 deletions(-) create mode 100644 doc/_templates/homepage.html rename doc/_templates/{docs-navbar.html => version-switcher.html} (53%) diff --git a/doc/_templates/homepage.html b/doc/_templates/homepage.html new file mode 100644 index 00000000000..35a75461c22 --- /dev/null +++ b/doc/_templates/homepage.html @@ -0,0 +1,42 @@ + +
+
+ {% for item in carousel %} +
+ + {{ item.alt }} +
+
{{ item.title }}
+

{{ item.text }}

+
+ +
+ {% endfor %} +
+
+ +
+

Funders

+
+
+ {% for item in funders -%} +
+ + {{ item.title }} + +
+ {% endfor %} +
+ +

Supporting institutions

+
+
+ {% for inst in institutions -%} +
+ + {{ inst.name }} + +
+ {% endfor %} +
+
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html index 59638326f56..8cb76c50fcf 100755 --- a/doc/_templates/layout.html +++ b/doc/_templates/layout.html @@ -1,67 +1,20 @@ -{%- extends "pydata_sphinx_theme/layout.html" %} +{%- extends 'pydata_sphinx_theme/layout.html' %} {% block extrahead %} - -{{ super() }} + {{ super() }} {% endblock %} - {% block docs_body %}
{% block body %} {% endblock %} {% if pagename == 'index' %} -
-
- {% for item in carousel %} -
- - {{ item.alt }} -
-
{{ item.title }}
-

{{ item.text }}

-
- -
- {% endfor %} -
-
- -
-

Funders

-
-
- {% for item in funders -%} -
- - {{ item.title }} - -
- {% endfor %} -
- -

Supporting institutions

-
-
- {% for inst in institutions -%} -
- - {{ inst.name }} - -
- {% endfor %} -
-
- + {%- include 'homepage.html' -%} {% endif %}
{% endblock %} - - -{%- block footer %} -
-

© Copyright {{ copyright }}

-
- +{%- block scripts_end %} + + {{ super() }} {%- endblock %} diff --git a/doc/_templates/docs-navbar.html b/doc/_templates/version-switcher.html similarity index 53% rename from doc/_templates/docs-navbar.html rename to doc/_templates/version-switcher.html index eddebb85d28..c8ad89c9b3a 100644 --- a/doc/_templates/docs-navbar.html +++ b/doc/_templates/version-switcher.html @@ -1,20 +1,13 @@ -{%- extends "pydata_sphinx_theme/docs-navbar.html" %} - -{%- block icon_links -%} -
  • -
      +
      {%- for ver, txt in versions_dropdown.items() %} -
    • {{ txt }}
      • + {{ txt }} {%- endfor %} -
    +
- -{%- include "icon-links.html" with context -%} -{%- endblock %} diff --git a/doc/conf.py b/doc/conf.py index fb46ea4f6ac..245fc8199eb 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -511,6 +511,7 @@ def append_attr_meth_examples(app, what, name, obj, options, lines): 'use_edit_page_button': False, 'navigation_with_keys': False, 'show_toc_level': 1, + 'navbar_end': ['navbar-icon-links.html', 'version-switcher.html'], 'google_analytics_id': 'UA-37225609-1', } From acdd89452dc8670197398bcc0420ab902e32a46b Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Mon, 12 Apr 2021 16:37:10 -0500 Subject: [PATCH 03/11] homepage tweaks --- doc/_static/mne_logo.svg | 912 +++++++---------------------------- doc/_static/style.css | 1 - doc/_templates/homepage.html | 44 +- doc/conf.py | 9 +- doc/index.rst | 2 +- 5 files changed, 201 insertions(+), 767 deletions(-) diff --git a/doc/_static/mne_logo.svg b/doc/_static/mne_logo.svg index c38d5586c3b..4fbd6baf3bf 100644 --- a/doc/_static/mne_logo.svg +++ b/doc/_static/mne_logo.svg @@ -1,744 +1,176 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + diff --git a/doc/_static/style.css b/doc/_static/style.css index 2b69a39b156..0db4cd83b9f 100644 --- a/doc/_static/style.css +++ b/doc/_static/style.css @@ -134,7 +134,6 @@ h5.card-header::before { div.frontpage-gallery { overflow: hidden; height: 200px; - max-width: 400px; justify-content: center; } div.frontpage-gallery a { diff --git a/doc/_templates/homepage.html b/doc/_templates/homepage.html index 35a75461c22..6c71b5927e2 100644 --- a/doc/_templates/homepage.html +++ b/doc/_templates/homepage.html @@ -2,34 +2,36 @@
{% for item in carousel %} -
- - {{ item.alt }} -
-
{{ item.title }}
-

{{ item.text }}

-
- +
+
+ + {{ item.alt }} +
+

{{ item.title }}

+

{{ item.text }}

+
+ +
{% endfor %}
-
-

Funders

-
-
- {% for item in funders -%} -
- - {{ item.title }} - -
- {% endfor %} +
+

Funders

+
+ {% for item in funders -%} +
+ + {{ item.title }} + +
+ {% endfor %} +
-

Supporting institutions

-
+
+

Supporting institutions

{% for inst in institutions -%}
diff --git a/doc/conf.py b/doc/conf.py index 245fc8199eb..e634a9b9a5f 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -667,19 +667,20 @@ def append_attr_meth_examples(app, what, name, obj, options, lines): url='https://www.uni-graz.at/', size=md), ], + # \u00AD is an optional hyphen (not rendered unless needed) 'carousel': [ dict(title='Source Estimation', - text='Distributed, sparse, mixed-norm, beamformers, dipole fitting, and more.', # noqa E501 + text='Distributed, sparse, mixed-norm, beam\u00ADformers, dipole fitting, and more.', # noqa E501 url='auto_tutorials/source-modeling/plot_mne_dspm_source_localization.html', # noqa E501 img='sphx_glr_plot_mne_dspm_source_localization_008.gif', alt='dSPM'), dict(title='Machine Learning', - text='Advanced decoding models including time generalization.', + text='Advanced decoding models including time general\u00ADiza\u00ADtion.', # noqa E501 url='auto_tutorials/machine-learning/plot_sensors_decoding.html', img='sphx_glr_plot_sensors_decoding_006.png', alt='Decoding'), dict(title='Encoding Models', - text='Receptive field estimation with optional smoothness priors.', # noqa E501 + text='Receptive field estima\u00ADtion with optional smooth\u00ADness priors.', # noqa E501 url='auto_tutorials/machine-learning/plot_receptive_field.html', img='sphx_glr_plot_receptive_field_001.png', alt='STRF'), @@ -689,7 +690,7 @@ def append_attr_meth_examples(app, what, name, obj, options, lines): img='sphx_glr_plot_stats_cluster_spatio_temporal_001.png', alt='Clusters'), dict(title='Connectivity', - text='All-to-all spectral and effective connectivity measures.', + text='All-to-all spectral and effective connec\u00ADtivity measures.', # noqa E501 url='auto_examples/connectivity/plot_mne_inverse_label_connectivity.html', # noqa E501 img='sphx_glr_plot_mne_inverse_label_connectivity_001.png', alt='Connectivity'), diff --git a/doc/index.rst b/doc/index.rst index d322d1895f5..c3d6d9216fc 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -18,7 +18,7 @@ MNE-Python Homepage :align: center -.. rst-class:: h4 text-center font-weight-light mb-4 +.. rst-class:: h4 text-center font-weight-light my-4 Open-source Python package for exploring, visualizing, and analyzing human neurophysiological data: MEG, EEG, sEEG, ECoG, NIRS, and more. From 9317f7eb810a6f755ea67bc6969ac64eaeceba07 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Mon, 12 Apr 2021 16:38:37 -0500 Subject: [PATCH 04/11] update institution logo --- .../institution_logos/Telecom_Paris_Tech.png | Bin 5335 -> 0 bytes .../institution_logos/Telecom_Paris_Tech.svg | 1 + doc/conf.py | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 doc/_static/institution_logos/Telecom_Paris_Tech.png create mode 100644 doc/_static/institution_logos/Telecom_Paris_Tech.svg diff --git a/doc/_static/institution_logos/Telecom_Paris_Tech.png b/doc/_static/institution_logos/Telecom_Paris_Tech.png deleted file mode 100644 index 32eb616fe43f4256ae9fed3a12b98c6b3de8e618..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5335 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 diff --git a/doc/_static/institution_logos/Telecom_Paris_Tech.svg b/doc/_static/institution_logos/Telecom_Paris_Tech.svg new file mode 100644 index 00000000000..493a00d5e79 --- /dev/null +++ b/doc/_static/institution_logos/Telecom_Paris_Tech.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/doc/conf.py b/doc/conf.py index e634a9b9a5f..1d36ef688de 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -623,7 +623,7 @@ def append_attr_meth_examples(app, what, name, obj, options, lines): url='https://sci.aalto.fi/', size=md), dict(name='Télécom ParisTech', - img='Telecom_Paris_Tech.png', + img='Telecom_Paris_Tech.svg', url='https://www.telecom-paris.fr/', size=md), dict(name='University of Washington', From a611887e611b6c13542cd642b01af3ff174a400d Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Mon, 12 Apr 2021 16:43:01 -0500 Subject: [PATCH 05/11] tiny wording change --- doc/funding.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/funding.rst b/doc/funding.rst index 72e5ae2f9e3..43d4ccf3454 100644 --- a/doc/funding.rst +++ b/doc/funding.rst @@ -18,7 +18,7 @@ Development of MNE-Python has been supported by: - |czi| **Chan Zuckerberg Initiative:** `EOSS2 `_ -Additionally, many universities or research institutions have supported their employees’ contributions to MNE-Python as part of normal work duties. These institutions are: +Additionally, many universities or research institutions have supported their employees’ contributions to MNE-Python as part of normal work duties. These institutions include: - `Massachusetts General Hospital `_ - `Athinoula A. Martinos Center for Biomedical Imaging `_ From eed10e5d5d19971d14a2857803be54620dcd5632 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Mon, 12 Apr 2021 16:46:00 -0500 Subject: [PATCH 06/11] bump theme version [skip azp][skip github][circle front] --- requirements_doc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_doc.txt b/requirements_doc.txt index c2ca49b86f6..f7b760372c6 100644 --- a/requirements_doc.txt +++ b/requirements_doc.txt @@ -1,6 +1,6 @@ sphinx https://github.com/numpy/numpydoc/archive/main.zip -pydata-sphinx-theme==0.5.0 +pydata-sphinx-theme==0.6.0 sphinx-gallery sphinxcontrib-bibtex>=2.1.2 memory_profiler From cea41ec7162090dd8e4d573c24c71520d57551b8 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Tue, 13 Apr 2021 14:25:43 -0500 Subject: [PATCH 07/11] fix footer/copyright --- doc/_templates/copyright.html | 1 + doc/conf.py | 1 + 2 files changed, 2 insertions(+) create mode 100644 doc/_templates/copyright.html diff --git a/doc/_templates/copyright.html b/doc/_templates/copyright.html new file mode 100644 index 00000000000..abea05537ff --- /dev/null +++ b/doc/_templates/copyright.html @@ -0,0 +1 @@ +

© Copyright {{ copyright }}

diff --git a/doc/conf.py b/doc/conf.py index 1d36ef688de..3554d241077 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -512,6 +512,7 @@ def append_attr_meth_examples(app, what, name, obj, options, lines): 'navigation_with_keys': False, 'show_toc_level': 1, 'navbar_end': ['navbar-icon-links.html', 'version-switcher.html'], + 'footer_items': ['copyright'], 'google_analytics_id': 'UA-37225609-1', } From 41b1c3f51587551aedc68fd4bc5e9164c551ae5a Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Tue, 13 Apr 2021 14:44:53 -0500 Subject: [PATCH 08/11] tweak gallery breakpoint --- doc/_static/style.css | 2 +- doc/_templates/homepage.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/_static/style.css b/doc/_static/style.css index 0db4cd83b9f..d988271081d 100644 --- a/doc/_static/style.css +++ b/doc/_static/style.css @@ -133,7 +133,7 @@ h5.card-header::before { /* ***************************************************** front page carousel */ div.frontpage-gallery { overflow: hidden; - height: 200px; + height: 180px; justify-content: center; } div.frontpage-gallery a { diff --git a/doc/_templates/homepage.html b/doc/_templates/homepage.html index 6c71b5927e2..963906cadb8 100644 --- a/doc/_templates/homepage.html +++ b/doc/_templates/homepage.html @@ -2,12 +2,12 @@
{% for item in carousel %} -
+
{{ item.alt }}
-

{{ item.title }}

+

{{ item.title }}

{{ item.text }}

 From 766e96e6cbd2d55651ae0aa4f9274b49802545e3 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Tue, 13 Apr 2021 14:57:27 -0500 Subject: [PATCH 09/11] tweak gallery zooms [circle front][skip azp][skip github] --- doc/_static/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/_static/style.css b/doc/_static/style.css index d988271081d..f87248adde5 100644 --- a/doc/_static/style.css +++ b/doc/_static/style.css @@ -142,12 +142,12 @@ div.frontpage-gallery a { } div.frontpage-gallery img.card-img { transform: scale(1.8); - transform-origin: 50% 30%; + transform-origin: 40% 20%; opacity: 0.2; transition: 400ms ease-out; } div.frontpage-gallery:hover img.card-img { - transform: scale(1.1); + transform: scale(1.2); opacity: 1.0; transition: 400ms ease-out; } From dd6b40167a55a92712032ea209d5d0917a4ca3fa Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Tue, 13 Apr 2021 16:34:28 -0500 Subject: [PATCH 10/11] update for theme fix --- doc/_static/style.css | 4 +++- doc/_templates/version-switcher.html | 24 +++++++++++------------- doc/conf.py | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/_static/style.css b/doc/_static/style.css index f87248adde5..5b973d4de03 100644 --- a/doc/_static/style.css +++ b/doc/_static/style.css @@ -125,9 +125,11 @@ h5.card-header::before { } /* ******************************************************** version dropdown */ +.dropdown { + padding: 0 .5rem; /* match other items in the hamburger menu */ +} .dropdown-toggle { font-weight: 600; - margin-left: 15px; /* match other items in the hamburger menu */ } /* ***************************************************** front page carousel */ diff --git a/doc/_templates/version-switcher.html b/doc/_templates/version-switcher.html index c8ad89c9b3a..235dcf4f5c8 100644 --- a/doc/_templates/version-switcher.html +++ b/doc/_templates/version-switcher.html @@ -1,13 +1,11 @@ -
    -
  • - -
    - {%- for ver, txt in versions_dropdown.items() %} - {{ txt }} - {%- endfor %} -
    -
    • -
+
+ +
+ {%- for ver, txt in versions_dropdown.items() %} + {{ txt }} + {%- endfor %} +
+
diff --git a/doc/conf.py b/doc/conf.py index 3554d241077..2c02f18fda1 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -511,7 +511,7 @@ def append_attr_meth_examples(app, what, name, obj, options, lines): 'use_edit_page_button': False, 'navigation_with_keys': False, 'show_toc_level': 1, - 'navbar_end': ['navbar-icon-links.html', 'version-switcher.html'], + 'navbar_end': ['version-switcher', 'navbar-icon-links'], 'footer_items': ['copyright'], 'google_analytics_id': 'UA-37225609-1', } From 8c6a00e03f0f5abfcb34c1b915d87b57c29af450 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Fri, 16 Apr 2021 18:00:05 -0500 Subject: [PATCH 11/11] bump theme version [circle front][skip github][skip azp] --- requirements_doc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_doc.txt b/requirements_doc.txt index f7b760372c6..d8953494015 100644 --- a/requirements_doc.txt +++ b/requirements_doc.txt @@ -1,6 +1,6 @@ sphinx https://github.com/numpy/numpydoc/archive/main.zip -pydata-sphinx-theme==0.6.0 +pydata-sphinx-theme==0.6.1 sphinx-gallery sphinxcontrib-bibtex>=2.1.2 memory_profiler