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 number width in code preview #31307

Merged
merged 2 commits into from
Jun 11, 2024
Merged

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Jun 10, 2024

Line numbers were using some hacky CSS width: 1% that did nothing to the code rendering as far as I can tell but broken the inline preview in markup when line numbers are greater than 2 digits. Also I removed one duplicate font-family rule (it is set below in the .lines-num, .lines-code selector.

Before:

Screenshot 2024-06-10 at 13 57 15

After:

Screenshot 2024-06-10 at 13 59 19

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 10, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 10, 2024
@silverwind silverwind added backport/v1.22 This PR should be backported to Gitea 1.22 type/bug labels Jun 10, 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 Jun 10, 2024
@delvh delvh added the topic/ui Change the appearance of the Gitea UI label Jun 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 Jun 11, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) June 11, 2024 04:50
@wxiaoguang wxiaoguang merged commit 397930d into go-gitea:main Jun 11, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Jun 11, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jun 11, 2024
Line numbers were using some hacky CSS `width: 1%` that did nothing to
the code rendering as far as I can tell but broken the inline preview in
markup when line numbers are greater than 2 digits. Also I removed one
duplicate `font-family` rule (it is set below in the `.lines-num,
.lines-code` selector.
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Jun 11, 2024
@wxiaoguang wxiaoguang deleted the linenumquote branch June 11, 2024 04:54
wxiaoguang pushed a commit that referenced this pull request Jun 11, 2024
Backport #31307 by silverwind

Line numbers were using some hacky CSS `width: 1%` that did nothing to
the code rendering as far as I can tell but broken the inline preview in
markup when line numbers are greater than 2 digits. Also I removed one
duplicate `font-family` rule (it is set below in the `.lines-num,
.lines-code` selector.

Co-authored-by: silverwind <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 11, 2024
* giteaofficial/main:
  Fix line number width in code preview (go-gitea#31307)
  Delete legacy cookie before setting new cookie (go-gitea#31306)
  [skip ci] Updated translations via Crowdin
  Use `querySelector` over alternative DOM methods (go-gitea#31280)
  Remove jQuery `.text()` (go-gitea#30506)
  [skip ci] Updated translations via Crowdin
  Remove sub-path from container registry realm (go-gitea#31293)
  Fix some URLs whose sub-path is missing (go-gitea#31289)
@wxiaoguang
Copy link
Contributor

This change doesn't seem right.

image

@silverwind
Copy link
Member Author

Odd, I didn't notice that. Does it only affect plaintext files?

@silverwind
Copy link
Member Author

It affects more, the column width seems kind of random when I click various files.

@silverwind
Copy link
Member Author

#31341

silverwind added a commit that referenced this pull request Jun 12, 2024
Fixes regression
#31307 (comment)

Table CSS is weird. A `auto` value does not work and causes the
regression while any pixel value causes another regression in diff where
the code lines do not stretch. Partially revert that PR and clean up
some related too-deep CSS selectors.

<img width="109" alt="Screenshot 2024-06-12 at 15 07 22"
src="https://github.com/go-gitea/gitea/assets/115237/756c5dea-44b8-49f9-8a08-acef68075f62">
<img width="119" alt="Screenshot 2024-06-12 at 15 07 43"
src="https://github.com/go-gitea/gitea/assets/115237/28ae1adc-118e-4016-8d09-033b9f1c9a6f">
<img width="151" alt="Screenshot 2024-06-12 at 15 07 07"
src="https://github.com/go-gitea/gitea/assets/115237/08db7ed9-de4e-405e-874d-c7ebe3082557">
<img width="141" alt="Screenshot 2024-06-12 at 15 07 14"
src="https://github.com/go-gitea/gitea/assets/115237/c4a5492b-1bf1-4773-bc8d-64eb36d823f9">
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jun 12, 2024
Fixes regression
go-gitea#31307 (comment)

Table CSS is weird. A `auto` value does not work and causes the
regression while any pixel value causes another regression in diff where
the code lines do not stretch. Partially revert that PR and clean up
some related too-deep CSS selectors.

<img width="109" alt="Screenshot 2024-06-12 at 15 07 22"
src="https://github.com/go-gitea/gitea/assets/115237/756c5dea-44b8-49f9-8a08-acef68075f62">
<img width="119" alt="Screenshot 2024-06-12 at 15 07 43"
src="https://github.com/go-gitea/gitea/assets/115237/28ae1adc-118e-4016-8d09-033b9f1c9a6f">
<img width="151" alt="Screenshot 2024-06-12 at 15 07 07"
src="https://github.com/go-gitea/gitea/assets/115237/08db7ed9-de4e-405e-874d-c7ebe3082557">
<img width="141" alt="Screenshot 2024-06-12 at 15 07 14"
src="https://github.com/go-gitea/gitea/assets/115237/c4a5492b-1bf1-4773-bc8d-64eb36d823f9">
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants