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 admin-dl-horizontal #25512

Merged
merged 9 commits into from
Jun 27, 2023
Merged

Fix admin-dl-horizontal #25512

merged 9 commits into from
Jun 27, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jun 26, 2023 •
edited
Loading

image

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 26, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 26, 2023
@wxiaoguang wxiaoguang mentioned this pull request Jun 26, 2023
Merged
@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 26, 2023
@silverwind
Copy link
Member

Seems better with no wrapping on desktop, yes. I guess it may still wrap on some locales.

silverwind
silverwind reviewed Jun 26, 2023
View reviewed changes
web_src/css/admin.css Outdated Show resolved Hide resolved
@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 26, 2023
@silverwind silverwind mentioned this pull request Jun 26, 2023
Merged
@silverwind
Copy link
Member

No additional changes necessary now that #25516 has merged, right?

@wxiaoguang
Copy link
Contributor Author

I think it's ready to merge.

@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 27, 2023
@silverwind silverwind enabled auto-merge (squash) June 27, 2023 08:42
@silverwind silverwind merged commit 6dbcf6f into go-gitea:main Jun 27, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jun 27, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 27, 2023
@wxiaoguang wxiaoguang deleted the increase-admin-left branch June 27, 2023 12:15
@wxiaoguang wxiaoguang added the backport/v1.20 This PR should be backported to Gitea 1.20 label Jun 27, 2023
@GiteaBot GiteaBot mentioned this pull request Jun 27, 2023
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Jun 27, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jun 27, 2023
@wxiaoguang @HesterG
@silverwind @GiteaBot
Fix admin-dl-horizontal (go-gitea#25512)
5d99e1f 
![image](https://github.com/go-gitea/gitea/assets/2114189/fb731e07-da30-4470-8200-73b5ca8b78f1)


![image](https://github.com/go-gitea/gitea/assets/2114189/85930b6f-5df7-437f-863f-423f3b81dd26)

---------

Co-authored-by: HesterG <[email protected]>
Co-authored-by: silverwind <[email protected]>
silverwind added a commit that referenced this pull request Jun 27, 2023
@GiteaBot @wxiaoguang
@HesterG @silverwind
Fix admin-dl-horizontal (#25512) (#25535)
614d6df 
Backport #25512 by @wxiaoguang


![image](https://github.com/go-gitea/gitea/assets/2114189/fb731e07-da30-4470-8200-73b5ca8b78f1)


![image](https://github.com/go-gitea/gitea/assets/2114189/85930b6f-5df7-437f-863f-423f3b81dd26)

Co-authored-by: wxiaoguang <[email protected]>
Co-authored-by: HesterG <[email protected]>
Co-authored-by: silverwind <[email protected]>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 25, 2023
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

Assignees
No one assigned
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
1.21.0
Development

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