Skip to content

Improve repo search UI #29767

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
Merged
merged 9 commits into from
Mar 15, 2024
Merged

Improve repo search UI #29767

merged 9 commits into from
Mar 15, 2024

Conversation

wxiaoguang
Copy link
Contributor

  1. Introduce a special "flex-items-block" for menu items, to align the dropdown menu items
  2. Simplify the "repo search" form
  3. Add missing "TopicOnly" search option

Screenshots:

The old UI items don't align:

image

New UI (doesn't change much, but the items align)

image

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 13, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/frontend modifies/templates This PR modifies the template files labels Mar 13, 2024
@wxiaoguang wxiaoguang force-pushed the fix-repo-search-topic branch from f13e4ba to 9d2db91 Compare March 13, 2024 12:46
@silverwind
Copy link
Member

Conflicts with #29530?

@wxiaoguang
Copy link
Contributor Author

Conflicts with #29530?

Almost no. https://github.com/go-gitea/gitea/pull/29530/files#diff-67f3f9c7fb99e56dd77e8494dbbbce1a57de1e89b58d959b11b8fc9da4fddc6b

At most, a few lines.

@silverwind
Copy link
Member

In any case, let's merge #29530 first.

@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 Mar 13, 2024
@wxiaoguang
Copy link
Contributor Author

In any case, let's merge #29530 first.

29530 looks like an over-engineering to me. And I haven't got time to test it. If it looks good to most reviewers, I am neutral.

@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 Mar 13, 2024
@denyskon
Copy link
Member

(please wait for my PR to be merged)

silverwind
silverwind previously requested changes Mar 13, 2024
View reviewed changes
Copy link
Member

@silverwind silverwind left a comment

Choose a reason for hiding this comment

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

Wait on #29530

@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Mar 13, 2024
@silverwind silverwind self-requested a review March 14, 2024 23:35
@silverwind
Copy link
Member

Unblocked now as #29530 was merged. Some conflicts as expected.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged labels Mar 14, 2024
delvh
delvh approved these changes Mar 14, 2024
View reviewed changes
@wxiaoguang
Merge branch 'main' into fix-repo-search-topic
1323919 
# Conflicts:
#	templates/shared/repo_search.tmpl
#	templates/shared/searchinput.tmpl
@wxiaoguang
fix merge
a9851be
silverwind
silverwind reviewed Mar 15, 2024
View reviewed changes
silverwind
silverwind reviewed Mar 15, 2024
View reviewed changes
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 15, 2024
@lunny lunny enabled auto-merge (squash) March 15, 2024 09:35
@lunny lunny added this to the 1.22.0 milestone Mar 15, 2024
@lunny lunny merged commit 7a6260f into go-gitea:main Mar 15, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 15, 2024
@wxiaoguang wxiaoguang deleted the fix-repo-search-topic branch March 15, 2024 11:49
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

@denyskon denyskon denyskon approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
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 type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
6 participants
@wxiaoguang @silverwind @denyskon @lunny @delvh @GiteaBot