fix br display for packages curls #23737
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wolfogre
added
type/bug
topic/ui
lunny
approved these changes
Mar 27, 2023
GiteaBot
added
the
lgtm/need 1
Codecov Report
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more @@ Coverage Diff @@
## main #23737 +/- ##
=========================================
Coverage 47.14% 47.14%
=========================================
Files 1149 1155 +6
Lines 151446 152485 +1039
=========================================
+ Hits 71397 71893 +496
- Misses 71611 72112 +501
- Partials 8438 8480 +42
... and 45 files with indirect coverage changes Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
wxiaoguang
reviewed
Mar 27, 2023
| @@ -6,7 +6,7 @@ | |||
| <label>{{svg "octicon-terminal"}} {{.locale.Tr "packages.generic.download"}}</label> | |||
| <div class="markup"><pre class="code-block"><code> | |||
| {{- range .PackageDescriptor.Files -}} | |||
| curl <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/generic/{{$.PackageDescriptor.Package.Name}}/{{$.PackageDescriptor.Version.Version}}/{{.File.Name}}"></gitea-origin-url><br> | |||
| curl <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/generic/{{$.PackageDescriptor.Package.Name}}/{{$.PackageDescriptor.Version.Version}}/{{.File.Name}}"></gitea-origin-url><br class="gt-di"> | |||
There was a problem hiding this comment.
It doesn't look good to me ....
I would say that the <br> was polluted somewhere else.
Couldn't the pollution be fixed properly?
There was a problem hiding this comment.
There was a problem hiding this comment.
It doesn't look good to me ....
I would say that the
<br>was polluted somewhere else.Couldn't the pollution be fixed properly?
Added a commit to get rid of the <br> here as mentioned in the comment below
There was a problem hiding this comment.
Why do we need these styles?
These do come from GitHub's CSS.
IDK their significance but I assume inside <code> and such, one breaks via \n usually because of white-space: pre formatting, not <br>.
|
To avoid using Just copy the code, no space indent, the last is |
wxiaoguang
reviewed
Mar 27, 2023
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
wolfogre
approved these changes
Mar 28, 2023
GiteaBot
added
lgtm/done
|
ping lg-tm |
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Mar 28, 2023
Before: <img width="1403" alt="截屏2023-03-27 15 48 23" src="https://user-images.githubusercontent.com/17645053/227875392-399debf7-db75-4d9a-9436-409f75447c65.png"> This happens because the `<br>` matches this [rule](https://github.com/go-gitea/gitea/blob/e6e602fd8d35471f1e2f4a42669a1f17e76e0176/web_src/css/markup/content.css#L428), which is not necessary here (This is introduced by go-gitea#22861, did a quick check, and this is the only place used `<br>` inside `<code>` from the PR): ```css .markup code br, .markup tt br { display: none; } ``` After: <img width="1398" alt="截屏2023-03-27 15 46 50" src="https://user-images.githubusercontent.com/17645053/227875244-b7fba432-b32c-42f7-9517-4e05bb2e64ea.png"> --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zeripath
pushed a commit
that referenced
this pull request
Mar 28, 2023
Backport #23737 by @HesterG Before: <img width="1403" alt="截屏2023-03-27 15 48 23" src="https://user-images.githubusercontent.com/17645053/227875392-399debf7-db75-4d9a-9436-409f75447c65.png"> This happens because the `<br>` matches this [rule](https://github.com/go-gitea/gitea/blob/e6e602fd8d35471f1e2f4a42669a1f17e76e0176/web_src/css/markup/content.css#L428), which is not necessary here (This is introduced by #22861, did a quick check, and this is the only place used `<br>` inside `<code>` from the PR): ```css .markup code br, .markup tt br { display: none; } ``` After: <img width="1398" alt="截屏2023-03-27 15 46 50" src="https://user-images.githubusercontent.com/17645053/227875244-b7fba432-b32c-42f7-9517-4e05bb2e64ea.png"> Co-authored-by: Hester Gong <hestergong@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Mar 29, 2023
* upstream/main: Refactor internal API for git commands, use meaningful messages instead of "Internal Server Error" (go-gitea#23687) Add CSS rules for basic colored labels (go-gitea#23774) Add meilisearch support (go-gitea#23136) Add missing translation for `actions.runners.reset_registration_token_success` (go-gitea#23732) [skip ci] Updated translations via Crowdin Implement Issue Config (go-gitea#20956) Set repository link based on the url in package.json for npm packages (go-gitea#20379) Add API to manage issue dependencies (go-gitea#17935) Add creation time in tag list page (go-gitea#23693) Make minio package support legacy MD5 checksum (go-gitea#23768) Yarden Shoham has a new email address (go-gitea#23767) fix br display for packages curls (go-gitea#23737)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before:
This happens because the
<br>matches this rule, which is not necessary here (This is introduced by #22861, did a quick check, and this is the only place used<br>inside<code>from the PR):After:
