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 line height on inline code preview #30372

Merged
merged 2 commits into from Apr 10, 2024
Merged

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Apr 9, 2024

Fixes #30353.

I don't know what causes code-inner to not inherit line-height from its direct parent .lines-code but instead from grandparent .markup even thought MDN tells me it's inherited. This causes no negative impact on other code views, so I think it's the best solution.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 9, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 9, 2024
@silverwind silverwind added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Apr 9, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 10, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 10, 2024
@lunny lunny added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Apr 10, 2024
@lunny lunny enabled auto-merge (squash) April 10, 2024 05:39
@lunny lunny merged commit 6cac11c into go-gitea:main Apr 10, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Apr 10, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 10, 2024
Fixes go-gitea#30353.

I don't know what causes `code-inner` to not inherit `line-height` from
its direct parent `.lines-code` but instead from grandparent `.markup`
even thought MDN tells me it's
[inherited](https://developer.mozilla.org/en-US/docs/Web/CSS/line-height#formal_definition).
This causes no negative impact on other code views, so I think it's the
best solution.
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Apr 10, 2024
@silverwind silverwind deleted the lheight branch April 10, 2024 05:46
silverwind added a commit that referenced this pull request Apr 10, 2024
Backport #30372 by @silverwind

Fixes #30353.

I don't know what causes `code-inner` to not inherit `line-height` from
its direct parent `.lines-code` but instead from grandparent `.markup`
even thought MDN tells me it's
[inherited](https://developer.mozilla.org/en-US/docs/Web/CSS/line-height#formal_definition).
This causes no negative impact on other code views, so I think it's the
best solution.

Co-authored-by: silverwind <me@silverwind.io>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 10, 2024
* giteaofficial/main:
  Fix line height on inline code preview (go-gitea#30372)
  Refactor more filterslice (go-gitea#30370)
  Fix ambiguous id when fetch Actions tasks (go-gitea#30382)
  Fix floated list items (go-gitea#30377)
  Fix actions design about default actions download url (go-gitea#30360)
  Add container.FilterSlice function (go-gitea#30339)
  Fix label-list rendering in timeline, decrease gap (go-gitea#30342)
  Performance optimization for git push (go-gitea#30104)
  Reduce checkbox size to 15px (go-gitea#30346)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Code is not in middle of line in code preview
4 participants