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.

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

Fix sidebar label dropdown divider #25359

Merged
merged 4 commits into from
Jun 19, 2023
Merged

Conversation

HesterG
Copy link
Contributor

@HesterG HesterG commented Jun 19, 2023

Follow #25312

Also fix the label dropdown on sidebar

Before:

Screen Shot 2023-06-19 at 08 55 05

After:

Screen Shot 2023-06-19 at 08 57 17

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 19, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 19, 2023
@HesterG HesterG added the topic/ui Change the appearance of the Gitea UI label Jun 19, 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 Jun 19, 2023
@@ -1,4 +1,4 @@
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-label dropdown">
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-label label-filter dropdown">
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't do this. The label-filter styles will pollute this select-label dropdown.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, changed to change selector instead in 8ec7f48

@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 Jun 19, 2023
@silverwind
Copy link
Member

Can backport if #25312 also backports.

@silverwind silverwind added the backport/v1.20 This PR should be backported to Gitea 1.20 label Jun 19, 2023
@silverwind silverwind enabled auto-merge (squash) June 19, 2023 17:26
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 19, 2023
@silverwind silverwind merged commit 49a77e3 into go-gitea:main Jun 19, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jun 19, 2023
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.20. @HesterG, please send one manually. 🍵

go run ./contrib/backport 25359
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 19, 2023
@silverwind silverwind removed the backport/manual No power to the bots! Create your backport yourself! label Jun 19, 2023
@silverwind
Copy link
Member

@GiteaBot should try again now that #25372 is merged.

@HesterG HesterG deleted the fix-sidebar-label branch June 20, 2023 01:03
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Jun 20, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 21, 2023
* giteaofficial/main:
  Refactor path & config system (go-gitea#25330)
  Add actor and status dropdowns to run list (go-gitea#25118)
  Use the new download domain replace the old (go-gitea#25405)
  Avoid polluting config file when "save" (go-gitea#25395)
  Fix dropdown icon layout on diff page (go-gitea#25397)
  Support configuration variables on Gitea Actions (go-gitea#24724)
  Substitute variables in path names of template repos too (go-gitea#25294)
  Navbar styling rework (go-gitea#25343)
  Fix blank dir message when uploading files from web editor (go-gitea#25391)
  Add git-lfs support to devcontainer (go-gitea#25385)
  Use qwtel.sqlite-viewer instead of alexcvzz.vscode-sqlite (go-gitea#25386)
  Use Actions git context instead of dynamically created buildkit one (go-gitea#25381)
  rename tributeValues to mentionValues (go-gitea#25375)
  Fix LDAP sync when Username Attribute is empty (go-gitea#25278)
  Fetch all git data for embedding correct version in docker image (go-gitea#25361)
  Fix sidebar label dropdown divider (go-gitea#25359)
  Fix issue filters on mobile view (go-gitea#25368)
  Refactor: TotalTimest return seconds (go-gitea#25370)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 17, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants