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

Fix margin bug at bottom of lists #218

Merged
merged 4 commits into from
Apr 4, 2023

Conversation

javabster
Copy link
Collaborator

@javabster javabster commented Mar 17, 2023

Fixes #201. As described there, we had two issues:

  1. For ordered lists, there was no margin underneath it.
  2. For unordered lists, we were adding a margin inside nested list elements, which was not intended. We only want to add a margin at the very end of the outer-most list.

This is fixed by only applying the margin to the elements article.pytorch-article ol and article.pytorch-article ul, which only apply to the outer most list.

Before:

Screenshot 2023-03-17 at 11 29 35 AM

--

After:

Screenshot 2023-03-17 at 11 28 30 AM

--

@Eric-Arellano Eric-Arellano changed the title Fix margin bug at bottom of ordered list Fix margin bug at bottom of lists Mar 17, 2023
@Eric-Arellano
Copy link
Collaborator

@HuangJunye please review and merge this if you're comfortable, since both Abby and I are OOO next week. cc @coruscating

Note that I expanded Abby's fix to also fix the issue I discovered with nested unordered list. Abby's code made it clear how to do that - thanks Abby!

@Eric-Arellano
Copy link
Collaborator

@javabster can you please double check that you agree with my changes, and then merge?

@Eric-Arellano Eric-Arellano merged commit 91ae6ee into Qiskit:main Apr 4, 2023
Eric-Arellano added a commit to Eric-Arellano/qiskit_sphinx_theme that referenced this pull request Apr 4, 2023
Fixes Qiskit#201. As described there, we had two issues:

1. For ordered lists, there was no margin underneath it. 
2. For unordered lists, we were adding a margin inside nested list
elements, which was not intended. We only want to add a margin at the
very end of the outer-most list.

This is fixed by only applying the margin to the elements
`article.pytorch-article ol` and `article.pytorch-article ul`, which
only apply to the outer most list.

## Before:

<img width="472" alt="Screenshot 2023-03-17 at 11 29 35 AM"
src="https://user-images.githubusercontent.com/23662430/225805307-76c22599-35b0-42a3-a57d-4db8cfc77708.png">

--



![](https://user-images.githubusercontent.com/14852634/224808178-ae18639c-503c-4224-b1db-98a23d33a94a.png)

## After:

<img width="474" alt="Screenshot 2023-03-17 at 11 28 30 AM"
src="https://user-images.githubusercontent.com/23662430/225805322-53ed87a4-c70a-4254-808f-3cd9addf46fe.png">

--


![](https://user-images.githubusercontent.com/14852634/224808410-76e98eba-f90a-4859-82a1-5c9fcf27143d.png)

---------

Co-authored-by: Eric Arellano <14852634+Eric-Arellano@users.noreply.github.com>
Eric-Arellano added a commit that referenced this pull request Apr 4, 2023
Fixes #201. As described there, we had two issues:

1. For ordered lists, there was no margin underneath it. 
2. For unordered lists, we were adding a margin inside nested list
elements, which was not intended. We only want to add a margin at the
very end of the outer-most list.

This is fixed by only applying the margin to the elements
`article.pytorch-article ol` and `article.pytorch-article ul`, which
only apply to the outer most list.

## Before:

<img width="472" alt="Screenshot 2023-03-17 at 11 29 35 AM"
src="https://user-images.githubusercontent.com/23662430/225805307-76c22599-35b0-42a3-a57d-4db8cfc77708.png">

--




![](https://user-images.githubusercontent.com/14852634/224808178-ae18639c-503c-4224-b1db-98a23d33a94a.png)

## After:

<img width="474" alt="Screenshot 2023-03-17 at 11 28 30 AM"
src="https://user-images.githubusercontent.com/23662430/225805322-53ed87a4-c70a-4254-808f-3cd9addf46fe.png">

--



![](https://user-images.githubusercontent.com/14852634/224808410-76e98eba-f90a-4859-82a1-5c9fcf27143d.png)

---------

Co-authored-by: Abby Mitchell <23662430+javabster@users.noreply.github.com>
coruscating added a commit to qiskit-community/qiskit-experiments that referenced this pull request Apr 10, 2023
### Summary

This PR follows Qiskit/qiskit#9705 to
remove the dependency on `sphinx-autodoc-typehints` and
Qiskit/qiskit-metapackage#1707 to use the
default Qiskit icon when the experiment manual isn't explicitly
provided.

### Details and comments

In addition, some experiment classes that didn't link to their manuals
have been updated with the link. Manual line breaks added after numbered
lists have been removed now that
Qiskit/qiskit_sphinx_theme#218 has been merged.
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.

Lists need bottom margin
2 participants