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 activity heat map padding & locale #30823

Merged
merged 9 commits into from
May 2, 2024
Merged

Fix activity heat map padding & locale #30823

merged 9 commits into from
May 2, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented May 2, 2024 •
edited
Loading

Fix #30808

image

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 2, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 2, 2024
@wxiaoguang wxiaoguang mentioned this pull request May 2, 2024
Closed
@silverwind
Copy link
Member

Can you copy the CSS from #30822 into here? I think the tooltip style is better for this tippy.

@wxiaoguang
Copy link
Contributor Author

Can you copy the CSS from #30822 into here? I think the tooltip style is better for this tippy.

Done, and the screenshots are updated.

@wxiaoguang
Copy link
Contributor Author

Also added the border radius, looks better.

@silverwind
Copy link
Member

Your border override is not working, it should have no visible border.

@wxiaoguang
Copy link
Contributor Author

Your border override is not working, it should have no visible border.

OK, I see the problem. border none should be on tippy-box while others should be on tippy-content (otherwise there will be stranage animation)

@silverwind
Copy link
Member

silverwind commented May 2, 2024 •
edited
Loading

Imho, put all styles on tippy-box. Other themes do it like that too.

@wxiaoguang
Copy link
Contributor Author

wxiaoguang commented May 2, 2024 •
edited
Loading

Imho, put all styles on tippy-box. Other themes do it like that too.

Nope, you could take a try, it would case strange animations.

image

image

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

silverwind commented May 2, 2024 •
edited
Loading

Imho, put all styles on tippy-box. Other themes do it like that too.

Nope, you could take a try, it would case strange animations.

Hmm it looked alright in my PR at least.

wxiaoguang and others added 2 commits May 2, 2024 20:57
@wxiaoguang
Copy link
Contributor Author

wxiaoguang commented May 2, 2024 •
edited
Loading

Hmm it looked alright in my PR at least.

I think the problem is caused by the transition: transform 0.1s ease-out selector.

Pros: it won't conflict with other tippy contents.
Cons: somewhat hacky and need to use 2 selectors for styles.

(I added one more comment "after PR 34 .. then all styles could be merged into .tippy-box selector.")

@silverwind
Copy link
Member

.tippy-box:not([data-theme]) will work, no other tippy will match on it as they will either have a custom theme or default.

@silverwind
Copy link
Member

silverwind commented May 2, 2024 •
edited
Loading

I just published my fork to npm, we can use it until upstream merges my PR:

@silverwind/vue3-calendar-heatmap@2.0.6

@wxiaoguang
Copy link
Contributor Author

.tippy-box:not([data-theme]) will work, no other tippy will match on it as they will either have a custom theme or default.

I do not think it is good/right to make it potential conflict with other tippy contents (we can never assume that every tippy content is managed by us, there would be more 3rd libraries)

But since you insist, 5f229c8

@wxiaoguang
Copy link
Contributor Author

wxiaoguang commented May 2, 2024 •
edited
Loading

I just published my fork to npm, we can use it until upstream merges my PR:

@silverwind/vue3-calendar-heatmap@2.0.6

That sounds good, could you help to update this PR? Or just keep it as-is? Either is fine to me.

@silverwind
Copy link
Member

I will try use my fork here.

@silverwind
Copy link
Member

Fork works 🎉

Screenshot 2024-05-02 at 15 17 35

@wxiaoguang
Copy link
Contributor Author

Awesome, perfect!

@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 May 2, 2024
@silverwind silverwind added the backport/v1.22 This PR should be backported to Gitea 1.22 label May 2, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) May 2, 2024 13:21
@wxiaoguang wxiaoguang merged commit eb8bb82 into go-gitea:main May 2, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 2, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 2, 2024
@wxiaoguang @silverwind @GiteaBot
Fix activity heat map padding & locale (go-gitea#30823)
78dd9ba 
Fix go-gitea#30808

---------

Co-authored-by: silverwind <me@silverwind.io>
@GiteaBot GiteaBot mentioned this pull request May 2, 2024
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 2, 2024
@wxiaoguang wxiaoguang deleted the fix-heatmap branch May 2, 2024 13:23
wxiaoguang added a commit that referenced this pull request May 2, 2024
@GiteaBot @wxiaoguang @silverwind
Fix activity heat map padding & locale (#30823) (#30827)
606b12c 
Backport #30823 by wxiaoguang

Fix #30808

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
@silverwind silverwind mentioned this pull request May 2, 2024
Closed
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 3, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
6e5359c 
* giteaofficial/main: (30 commits)
  Improve grep search (go-gitea#30843)
  Don't only list code-enabled repositories when using repository API (go-gitea#30817)
  Fix no edit history after editing issue's title and content (go-gitea#30814)
  Ignore useless error message "broken pipe" (go-gitea#30801)
  Fix JS error on pull request page (go-gitea#30838)
  Fix body margin shifting with modals, fix error on project column edit (go-gitea#30831)
  Improve repo button row layout (go-gitea#30668)
  refactor: merge ListActionTasks func to action.go file (go-gitea#30811)
  Prevent automatic OAuth grants for public clients (go-gitea#30790)
  Catch and handle unallowed file type errors in issue attachment API (go-gitea#30791)
  Fix incorrect message id for releaes email (go-gitea#30825)
  Add hover outline to heatmap squares (go-gitea#30828)
  Remove external API calls in `TestPassword` (go-gitea#30716)
  Upgrade chi-binding (go-gitea#30826)
  Improve context popup rendering (go-gitea#30824)
  Fix activity heat map padding & locale (go-gitea#30823)
  Fix issue card layout (go-gitea#30800)
  Fix branch selector UI (go-gitea#30803)
  Fix rounded border for segment followed by pagination (go-gitea#30809)
  Skip gzip for some well-known compressed file types (go-gitea#30796)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

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/dependencies modifies/js size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

broken styles on hover in activity
4 participants
@wxiaoguang @silverwind @lunny @GiteaBot