Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.10.12"
python-version: "3.11.5"

- name: Install pipenv and dependencies
run: |
Expand Down
1 change: 0 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ sphinxcontrib-email = "*"
pydata-sphinx-theme = "*"
make = "*"
ipython = "==8.10.0" # this version is required to avoid the "WARNING: Pygments lexer name 'ipython3' is not known" that occurs when trying to use notebooks in sphinx - maybe this will be updated
sphinx-autobuild = "*"
1,377 changes: 716 additions & 661 deletions Pipfile.lock

Large diffs are not rendered by default.

192 changes: 191 additions & 1 deletion source/_static/images/oe_logo_name.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions source/_static/theme_overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ h6 {

/* navigation bar colors*/
.navbar {
background: white !important;
background: #cd98c2ff !important;
font-size: 1em;
}

.navbar-nav>.active>.nav-link {
background-color: white !important;
color: #344b39 !important;
background-color: #e6eddf !important;
color: #2f401f !important;
font-weight: normal !important;
transition-duration: 0.4s;
}
Expand All @@ -125,20 +125,20 @@ h6 {
}

.navbar a {
color: grey !important;
color: white !important;
font-family: "Bitter", sans-serif;
transition-duration: 0.4s;
margin-right: 10px;
}

.search-button {
color: grey !important;
color: white !important;
margin-right: 30px;
}


.navbar a:hover {
color: grey !important;
color: #2f401f !important;
transition-duration: 0.4s;
}

Expand Down
2 changes: 1 addition & 1 deletion source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
# a list of builtin themes.
#
html_theme = "pydata_sphinx_theme"
html_logo = "_static/images/miniscope-logo.png"
html_logo = "_static/images/oe_logo_name.svg"
html_scaled_image_link = True
html_title = project

Expand Down
4 changes: 2 additions & 2 deletions source/ucla-miniscope-v4/developer/mods/spectral.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The UCLA Miniscope v4 as sold by Open Ephys is compatible with green indicators
Standard
********

470nm (blue) LED excitation light source (`LXZ1-PB01 <https://octopart.com/datasheet/lxz1-px01-lumileds-31228818>`__) to image a green indicator e.g. `GCaMP6f <https://www.fpbase.org/protein/gcamp6f/>`__:
470nm (blue) LED excitation light source (`LXZ1-PB01 <https://luxeonstar.com/wp-content/uploads/documentation/ds105.pdf>`__) to image a green indicator e.g. `GCaMP6f <https://www.fpbase.org/protein/gcamp6f/>`__:

.. figure:: /_static/images/gcamp6f.svg
:alt: plot of emission/excitation spectra of GCaMP6f
Expand Down Expand Up @@ -38,7 +38,7 @@ The standard UCLA Miniscope v4 is sold by Open Ephys in DIY kits and already ass
Lime
****

560nm (yellow-green) LED excitation light source (`LXZ1-PX01 <https://octopart.com/datasheet/lxz1-px01-lumileds-31228818>`__) to image a red indicator e.g. `jRGECO1a <https://www.fpbase.org/protein/jrgeco1a/>`__:
560nm (yellow-green) LED excitation light source (`LXZ1-PX01 <https://luxeonstar.com/wp-content/uploads/documentation/ds105.pdf>`__) to image a red indicator e.g. `jRGECO1a <https://www.fpbase.org/protein/jrgeco1a/>`__:

.. figure:: /_static/images/jrgeco1a.svg
:alt: plot of emission/excitation spectra of jRGECO1a
Expand Down