Skip to content

MRG+1, DOC: footer logos#6420

Merged
cbrnr merged 6 commits intomne-tools:masterfrom
drammock:footer-logos
Jun 7, 2019
Merged

MRG+1, DOC: footer logos#6420
cbrnr merged 6 commits intomne-tools:masterfrom
drammock:footer-logos

Conversation

@drammock
Copy link
Copy Markdown
Member

@drammock drammock commented Jun 6, 2019

  • adds Uni-Graz to the footer logos (@cbrnr)
  • uses separate file for each logo (so it's easier to add new ones)
  • each logo is now clickable, and displays the institution name when hovering

Looks good for me locally; hopefully same on CircleCI

@codecov
Copy link
Copy Markdown

codecov bot commented Jun 6, 2019

Codecov Report

Merging #6420 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #6420      +/-   ##
==========================================
+ Coverage   89.27%   89.28%   +<.01%     
==========================================
  Files         411      411              
  Lines       74477    74551      +74     
  Branches    12312    12327      +15     
==========================================
+ Hits        66487    66560      +73     
- Misses       5133     5135       +2     
+ Partials     2857     2856       -1

@drammock

This comment has been minimized.

@drammock
Copy link
Copy Markdown
Member Author

drammock commented Jun 6, 2019

@cbrnr
Copy link
Copy Markdown
Contributor

cbrnr commented Jun 6, 2019

Thanks for adding my institution! Did you want to put the logos in three rows, where Inria is the only logo in the second row? If it is not possible to put them into one row anymore, I'd split them up into two rows.

@agramfort
Copy link
Copy Markdown
Member

agramfort commented Jun 6, 2019 via email

@larsoner
Copy link
Copy Markdown
Member

larsoner commented Jun 6, 2019

Did you want to put the logos in three rows, where Inria is the only logo in the second row?

It looks like a CSS class problem, probably. Maybe max-width needs to be set? For me in chrome dev tools if I add width=100px to the Inria img I get two rows automatically, so the problem seems to be with that particular image (probably the SVG itself) trying to be 100% width.

@drammock
Copy link
Copy Markdown
Member Author

drammock commented Jun 6, 2019 via email

@larsoner
Copy link
Copy Markdown
Member

larsoner commented Jun 6, 2019

Chrome:

Screenshot from 2019-06-06 11-10-50

@drammock
Copy link
Copy Markdown
Member Author

drammock commented Jun 6, 2019

switching Inria from SVG to PNG solved the weird issue with Inria being on its own line; not sure what that was all about. I also added some margins to the logos so they're not so crammed together. What I can't figure out how to do is prevent the (now taller) footer from overlaying the last bit of the page content... a margin-bottom on the main content container wouldn't be responsive to different window widths, and anyway I can't tell in layout.html where I would add an additional class to that div in order to target it differently from all the other .containers. What we need is the equivalent of clear:both; I've read that display:table can be useful in such cases, but that didn't work when editing in the dev console... I think I'll need help (@larsoner?) to sort this out.

@drammock
Copy link
Copy Markdown
Member Author

drammock commented Jun 6, 2019

actually, I think I got it. Will push a fix after confirming with a local re-build.

@larsoner
Copy link
Copy Markdown
Member

larsoner commented Jun 6, 2019

FYI if the partial rebuilds are taking a while for you, you probably need numpy/numpydoc#226

Copy link
Copy Markdown
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@drammock drammock changed the title MRG, DOC: footer logos MRG+1, DOC: footer logos Jun 6, 2019
@cbrnr cbrnr merged commit f4b66b5 into mne-tools:master Jun 7, 2019
@cbrnr
Copy link
Copy Markdown
Contributor

cbrnr commented Jun 7, 2019

Thanks @drammock!

@drammock drammock deleted the footer-logos branch June 7, 2019 18:20
@cbrnr
Copy link
Copy Markdown
Contributor

cbrnr commented Jun 11, 2019

Can we backport this so that the changes go live with 0.18.2?

@agramfort
Copy link
Copy Markdown
Member

agramfort commented Jun 11, 2019 via email

larsoner pushed a commit to larsoner/mne-python that referenced this pull request Jun 11, 2019
* add individual inst. logos; add uni-graz

* add image titles (hover)

* force add missing logos

* codespell skip SVG files

* fix: make inria PNG; better logo wrapping

* fix footer overlap; slightly larger logos
@cbrnr
Copy link
Copy Markdown
Contributor

cbrnr commented Jun 11, 2019

Thanks @larsoner!

agramfort pushed a commit that referenced this pull request Jun 12, 2019
* FIX: allow raw_fif to parse brainvision events (#6417)

* TST: usecase

* FIX: check annotation description base names

* fix: remove pathlib

* RFC: Alternative without getattr.

* imports

* Fix: avoid adding 'barinvision' as event_id keyword

* remove _get_auto_event_id

* update whatsnew

* Update brainvision.py

* cosmit

* fix

* use rstrip

* MRG+1, DOC: footer logos (#6420)

* add individual inst. logos; add uni-graz

* add image titles (hover)

* force add missing logos

* codespell skip SVG files

* fix: make inria PNG; better logo wrapping

* fix footer overlap; slightly larger logos

* STY: prefer _DefaultEventParser to _Counter (#6355)

* Fix docstrings (#6385)

* docstring deduplication

* more n_jobs

* fix: import fill_doc

* fix crossrefs; deduplicate docdict def for random_state

* FIX: Conftest [circle front]

* FIX: Ref [circle front]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants