Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert style changes #459

Merged
merged 1 commit into from
Aug 28, 2021
Merged

revert style changes #459

merged 1 commit into from
Aug 28, 2021

Conversation

akhmerov
Copy link
Contributor

@akhmerov akhmerov commented Aug 28, 2021

Closes #452

  • I restored the xarray highlight. As a side note, I think a fix on the xarray side would be better: it seems counter-intuitive to require consumers to show elements with [hidden].
  • I restored the dd style from basic. This also fixes the autodoc indentation parts. Here, I think we're running into a problem of combining scss for theme asset compilation together with css inheritance. It may be more appropriate to vendor the entire of basic.css into the build chain.
  • Restored the white color of the navbar (bootstrap considers that one !important as well).

@akhmerov
Copy link
Contributor Author

akhmerov commented Aug 28, 2021

Some of the changes don't seem to come from #451:

Stable:

<dt id="numpy.linalg.eig">
<code class="sig-prename descclassname"><span class="pre">numpy.linalg.</span></code><code class="sig-name descname"><span class="pre">eig</span></code><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">a</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#numpy.linalg.eig" title="Permalink to this definition"></a></dt>

Latest:

<dt class="sig sig-object py" id="numpy.linalg.eig">
<span class="sig-prename descclassname"><span class="pre">numpy.linalg.</span></span><span class="sig-name descname"><span class="pre">eig</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">a</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#numpy.linalg.eig" title="Permalink to this definition"></a></dt>

Note how the CSS classes are different and even some codes become spans.

I propose to consider this out of scope of the CSS fixes (this PR) and investigate separately—must be something on sphinx side.

@akhmerov akhmerov marked this pull request as ready for review August 28, 2021 18:30
@akhmerov
Copy link
Contributor Author

If this looks OK, I propose to merge as is, and open a separate issue for investigating why the classes and tags of the autodoc changed (it's likely sphinx/autodoc/... version change).

@choldgraf
Copy link
Collaborator

Hmm - maybe those are from the latest release of Sphinx. If you downgrade to sphinx 3 do they revert as well?

@choldgraf
Copy link
Collaborator

Could you open that issue? I know it wasn't your PR that caused it but I'm on mobile right now!

@akhmerov
Copy link
Contributor Author

I confirm: the autodoc title looks exactly the same as in stable branch if I downgrade to sphinx 3.5. Not sure how this should be addressed in the theme though.

@akhmerov
Copy link
Contributor Author

I opened #460

@choldgraf choldgraf merged commit c6b5d54 into pydata:master Aug 28, 2021
@choldgraf
Copy link
Collaborator

LGTM - thanks for following up on this! Merging so that we can get these fixes in

@jorisvandenbossche
Copy link
Member

@akhmerov thanks for the quick follow-up here!

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.

Follow-up fixes from CSS reshuffling
3 participants