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

Improve detecting empty files #31332

Merged
merged 7 commits into from
Jun 13, 2024
Merged

Conversation

wxiaoguang
Copy link
Contributor

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 12, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 12, 2024
@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Jun 12, 2024
@wxiaoguang wxiaoguang added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Jun 12, 2024
@silverwind
Copy link
Member

Thanks, will test with my 3 sample files.

@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 12, 2024
@silverwind
Copy link
Member

silverwind commented Jun 12, 2024

Rendering looks good on all three sample files. I would prefer the placeholder text to be horizontally centered so that it can't be confused with actual content.

@silverwind
Copy link
Member

silverwind commented Jun 12, 2024

Centered the text, works fine in plaintext as well as markup:

Screenshot 2024-06-12 at 18 45 29 Screenshot 2024-06-12 at 18 45 12

There is different padding because of markdown parent class, but I guess this is a neglible issue.

@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 12, 2024
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 12, 2024
@silverwind
Copy link
Member

padding, font-size and line-height fixed on the placeholder, so it looks exactly the same on markup vs. plaintext now:

Screenshot 2024-06-12 at 18 54 05

templates/repo/view_file.tmpl Show resolved Hide resolved
web_src/css/repo.css Outdated Show resolved Hide resolved
@wxiaoguang wxiaoguang enabled auto-merge (squash) June 13, 2024 00:59
@wxiaoguang wxiaoguang merged commit 47ca61d into go-gitea:main Jun 13, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Jun 13, 2024
@wxiaoguang wxiaoguang deleted the refactor-empty-file branch June 13, 2024 01:07
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 13, 2024
* giteaofficial/main:
  Fixed incorrect localization `explorer.go` (go-gitea#31348)
  Improve detecting empty files (go-gitea#31332)
  Fix hash render end with colon (go-gitea#31319)
  Fix line number widths (go-gitea#31341)
  Fix navbar `+` menu flashing on page load (go-gitea#31281)
  Reduce memory usage for chunked artifact uploads to MinIO (go-gitea#31325)
  Fix dates displaying in a wrong manner when we're close to the end of the month (go-gitea#31331)
  Fix adopt repository has empty object name in database (go-gitea#31333)
  Optimize profile layout to enhance visual experience (go-gitea#31278)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files modifies/translation size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants