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.

Sign up for GitHub

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

Jump to bottom

Fix code block style for code preview #30298

Merged
merged 2 commits into from
Apr 6, 2024
Merged

Fix code block style for code preview #30298

merged 2 commits into from
Apr 6, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Apr 5, 2024 •
edited
Loading

Fix #30292

To avoid unnecessary style overriding, use "div" instead of "code":

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 5, 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 5, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Apr 5, 2024
@wxiaoguang wxiaoguang force-pushed the fix-markup-code-block branch from e54df68 to f72f6f3 Compare April 5, 2024 17:47
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 5, 2024
This was referenced Apr 5, 2024
Closed
Closed
@wxiaoguang wxiaoguang added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Apr 5, 2024
delvh
delvh reviewed Apr 5, 2024
View reviewed changes
Copy link
Member

@delvh delvh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the change to the alert parsing missing?

services/markup/processorhelper_codepreview_test.go Outdated
@@ -63,7 +63,7 @@ func TestProcessorHelperCodePreview(t *testing.T) {
<table class="file-view">
<tbody><tr>
<td class="lines-num"><span data-line-number="1"></span></td>
<td class="lines-code chroma"><code class="code-inner"><span class="gh"># repo1</code></td>
<td class="lines-code chroma"><span class="code-inner"><span class="gh"># repo1</span></td>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why span instead of div?

Copy link
Contributor Author

@wxiaoguang wxiaoguang Apr 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because "span" doesn't work .... (update: added some comments)

image

Oh I see, that's some intermediate code (Maybe I created the PR too fast before my push finished), I have changed all to "div" 🤣

@wxiaoguang
Copy link
Contributor Author

Isn't the change to the alert parsing missing?

Sorry but I didn't get the point. What missing?

@wxiaoguang wxiaoguang force-pushed the fix-markup-code-block branch from f72f6f3 to 045c285 Compare April 5, 2024 18:00
@wxiaoguang wxiaoguang requested review from delvh and silverwind April 5, 2024 18:14
@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 5, 2024
@silverwind
Copy link
Member

Much better this way. Rendering inside markup is always tricky and the less mismatching styles the better.

@silverwind silverwind mentioned this pull request Apr 5, 2024
Merged
@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 6, 2024
@wxiaoguang wxiaoguang merged commit 7396172 into go-gitea:main Apr 6, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Apr 6, 2024
@wxiaoguang wxiaoguang deleted the fix-markup-code-block branch April 6, 2024 12:07
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 6, 2024
@wxiaoguang @GiteaBot
Fix code block style for code preview (go-gitea#30298)
48b610a 
Fix go-gitea#30292

To avoid unnecessary style overriding, use "div" instead of "code"
@GiteaBot GiteaBot mentioned this pull request Apr 6, 2024
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 6, 2024
wxiaoguang added a commit that referenced this pull request Apr 6, 2024
@GiteaBot @wxiaoguang
Fix code block style for code preview (#30298) (#30306)
45e8a88 
Backport #30298 by wxiaoguang

Fix #30292

To avoid unnecessary style overriding, use "div" instead of "code"

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 8, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
aa3428f 
* giteaofficial/main: (26 commits)
  Fix oauth2 builtin application logic (go-gitea#30304)
  [skip ci] Updated licenses and gitignores
  Some NuGet package enhancements (go-gitea#30280)
  Fix and rewrite contrast color calculation, fix project-related bugs (go-gitea#30237)
  Add `--page-spacing` variable, fix admin dashboard notice (go-gitea#30302)
  Action view mobile improvements and fixes (go-gitea#30309)
  Fix checkboxes on mobile view, remove some dead css (go-gitea#30308)
  Clean up log messages (go-gitea#30313)
  Fix right-aligned input icons (go-gitea#30301)
  Refactor startup deprecation messages (go-gitea#30305)
  [skip ci] Updated translations via Crowdin
  Remove fomantic list module (go-gitea#30281)
  Markup color and font size fixes (go-gitea#30282)
  Fix code block style for code preview (go-gitea#30298)
  Always use `octicon-eye` on watch button (go-gitea#30288)
  Fix view commit link (go-gitea#30297)
  Add gap to commit status details (go-gitea#30284)
  Update JS dependencies and add new eslint rules (go-gitea#30279)
  Upgrade `golang.org/x/net` to v0.24.0 (go-gitea#30283)
  Commit-Dropdown: Show Author of commit if available (go-gitea#30272)
  ...

# Conflicts:
#	templates/base/footer_content.tmpl
AvengerMoJo pushed a commit to AvengerMoJo/gitea that referenced this pull request Apr 8, 2024
@wxiaoguang @AvengerMoJo
Fix code block style for code preview (go-gitea#30298)
66e78f5 
Fix go-gitea#30292

To avoid unnecessary style overriding, use "div" instead of "code"
@yp05327 yp05327 mentioned this pull request Apr 9, 2024
Closed
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 27, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

@delvh delvh Awaiting requested review from delvh

Assignees
No one assigned
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. modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files size/S Denotes a PR that changes 10-29 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
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Code markup style regression
5 participants
@wxiaoguang @silverwind @lunny @delvh @GiteaBot