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 whitespace rendering in diff #13415

Merged
merged 1 commit into from
Nov 4, 2020
Merged

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Nov 3, 2020

  • Introduce new .code-inner class that sets the CSS attributes on rendered code lines like view, blame and diff.
  • Rename .wrap class to .word-break to reflect what it actually does
  • Add new .pre-wrap helper, currently unused
  • Remove .raw which was only used on webhook page
  • Set white-space: pre-wrap except on blame where it can break the layout

Fixes: #13406

@silverwind silverwind force-pushed the fixindent branch 2 times, most recently from 35b3e8a to 87b70bd Compare November 3, 2020 18:35
@6543 6543 added type/bug topic/ui Change the appearance of the Gitea UI labels Nov 3, 2020
- Introduce new .code-inner class that sets the CSS attributes on
rendered code lines like view,blame and diff.
- Rename .wrap class to .word-break to reflect what it actually does
- Remove .raw which was only used on webhook page
- Set white-space: pre-wrap except on blame where it can break the
layout

Fixes: go-gitea#13406
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Nov 3, 2020
@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 Nov 4, 2020
@lafriks lafriks merged commit 62719cd into go-gitea:master Nov 4, 2020
@silverwind silverwind deleted the fixindent branch November 4, 2020 07:18
silverwind added a commit to silverwind/gitea that referenced this pull request Nov 13, 2020
We can't wrap code in blame because it's essentially two tables
side-by-side which will misalign them when one line gets larger.

Fixes: go-gitea#13540
Regressed by: go-gitea#13415
@6543 6543 added this to the 1.14.0 milestone Nov 13, 2020
techknowlogick added a commit that referenced this pull request Nov 13, 2020
We can't wrap code in blame because it's essentially two tables
side-by-side which will misalign them when one line gets larger.

Fixes: #13540
Regressed by: #13415

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Commit and PR diff view does not honour spaces/tabs
5 participants