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 user labels are invisible #27279

Closed
wants to merge 2 commits into from
Closed

Fix user labels are invisible #27279

wants to merge 2 commits into from

Conversation

lng2020
Copy link
Member

@lng2020 lng2020 commented Sep 26, 2023

Currently, when editing whitelists of protected branch rules in the repo setting, the user labels are invisible.
ksnip_20230926-174106
That's because the transition module is removed and couldn't handle "transition: scale".
This PR adds the code logic to handle this case and fix the bug.
ksnip_20230926-171411

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 26, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 26, 2023
@github-actions github-actions bot added the topic/ui Change the appearance of the Gitea UI label Sep 26, 2023
@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 Sep 26, 2023
@lunny lunny added the type/bug label Sep 26, 2023
@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 Sep 26, 2023
@silverwind silverwind added the backport/v1.21 This PR should be backported to Gitea 1.21 label Sep 26, 2023
@wxiaoguang
Copy link
Contributor

It looks strange. I will take a look.

silverwind
silverwind reviewed Sep 26, 2023
View reviewed changes
web_src/js/modules/fomantic.js
@@ -35,6 +35,7 @@ export function initGiteaFomantic() {

const isIn = arg?.animation?.endsWith(' in');
const isOut = arg?.animation?.endsWith(' out');
const isScale = arg?.animation?.includes('scale');
Copy link
Member

Choose a reason for hiding this comment

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

Maybe startsWith, assuming this is scale in etc.

@wxiaoguang
Copy link
Contributor

The old code is not right either.

According to the Fomantic UI design pattern, the arg could be a string, or an object {animation: '...'} , some edge cases should be handled one by one.

@silverwind
Copy link
Member

The code does accept both arg forms, but I do confess this implementation was mostly trial end error.

@lng2020
Copy link
Member Author

lng2020 commented Sep 26, 2023

related(#27286)

@wxiaoguang wxiaoguang mentioned this pull request Sep 26, 2023
Merged
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Sep 26, 2023 •
edited
Loading

-> Fix some animation bugs #27287

The new PR is not "trial end error", while it (almost) strictly follows the Fomantic UI's definition.

@wxiaoguang wxiaoguang added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR and removed lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged labels Sep 26, 2023
@lng2020 lng2020 closed this Sep 27, 2023
lunny pushed a commit that referenced this pull request Sep 27, 2023
@wxiaoguang
Fix some animation bugs (#27287)
6967c13 
Fix #27286
Replace #27279
@GiteaBot GiteaBot mentioned this pull request Sep 27, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 27, 2023
@wxiaoguang @GiteaBot
Fix some animation bugs (go-gitea#27287)
c37f579 
Fix go-gitea#27286
Replace go-gitea#27279
wxiaoguang added a commit that referenced this pull request Sep 27, 2023
@GiteaBot @wxiaoguang
Fix some animation bugs (#27287) (#27294)
fee8522 
Backport #27287

Fix #27286
Replace #27279

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@lng2020 lng2020 deleted the fix/user_labels branch October 11, 2023 09:54
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 26, 2023
@lunny lunny removed the backport/v1.21 This PR should be backported to Gitea 1.21 label Mar 25, 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

@wxiaoguang wxiaoguang wxiaoguang left review comments

Assignees
No one assigned
Labels
lgtm/need 1 This PR needs approval from one additional maintainer to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lng2020 @wxiaoguang @silverwind @lunny @GiteaBot