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 label color, fix divider in dropdown #24215

Merged
merged 3 commits into from
Apr 21, 2023
Merged

Fix label color, fix divider in dropdown #24215

merged 3 commits into from
Apr 21, 2023

Conversation

silverwind
Copy link
Member

Two small CSS fixes:

  1. Fix basic primary label hover:

Before:
Screenshot 2023-04-19 at 20 00 32

After:
Screenshot 2023-04-19 at 20 05 29

  1. Fix border color of divider in dropdown and remove margin so it looks better with hover effect, as discussed in Make wiki title supports dashes and improve wiki name related features #24143:

Screenshot 2023-04-19 at 20 03 24

Screenshot 2023-04-19 at 20 03 55

@silverwind silverwind added the type/enhancement An improvement of existing functionality label Apr 19, 2023
@silverwind silverwind added this to the 1.20.0 milestone Apr 19, 2023
@silverwind silverwind added the topic/ui Change the appearance of the Gitea UI label Apr 19, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 19, 2023
@silverwind silverwind mentioned this pull request Apr 19, 2023
Merged
@silverwind silverwind added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 19, 2023
@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 Apr 20, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 20, 2023
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Apr 20, 2023 •
edited
Loading

Wait, I think the fix for divider is not ideal.

All modern UI's divider has margin, see:

macOS native:

image

GitHub:

image

Chrome on Windows:

image

Windows native:

image

@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 20, 2023
@silverwind
Copy link
Member Author

Well, at least I would half the margin for more compact display.

@silverwind silverwind marked this pull request as draft April 20, 2023 06:24
@silverwind
Copy link
Member Author

silverwind commented Apr 20, 2023 •
edited
Loading

Added back a bit of margin. I think it's a good compromise:

image

@wxiaoguang looking good?

@silverwind silverwind marked this pull request as ready for review April 20, 2023 22:41
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 21, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) April 21, 2023 01:52
@techknowlogick
Copy link
Member

🤖 🎺

@techknowlogick techknowlogick merged commit 948a9ee into go-gitea:main Apr 21, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 21, 2023
@GiteaBot GiteaBot mentioned this pull request Apr 21, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 21, 2023
@silverwind @GiteaBot
Fix label color, fix divider in dropdown (go-gitea#24215)
22c22d9 
Two small CSS fixes:

1. Fix basic primary label hover
2. Fix border color of divider in dropdown and remove margin so it looks
better with hover effect, as discussed in
go-gitea#24143:
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 21, 2023
jolheiser pushed a commit that referenced this pull request Apr 21, 2023
@GiteaBot @silverwind
Fix label color, fix divider in dropdown (#24215) (#24244)
7117355 
Backport #24215 by @silverwind

Two small CSS fixes:

1. Fix basic primary label hover:

Before:
<img width="172" alt="Screenshot 2023-04-19 at 20 00 32"
src="https://user-images.githubusercontent.com/115237/233161903-eec2de54-1a58-44ac-a6ef-2d77157317f6.png">

After:
<img width="179" alt="Screenshot 2023-04-19 at 20 05 29"
src="https://user-images.githubusercontent.com/115237/233162028-995404ac-5852-4d03-821f-6eb4a918a9e3.png">

2. Fix border color of divider in dropdown and remove margin so it looks
better with hover effect, as discussed in
#24143:

<img width="205" alt="Screenshot 2023-04-19 at 20 03 24"
src="https://user-images.githubusercontent.com/115237/233162102-3f4a4142-9634-4c95-acf0-be57072ce7eb.png">
<img width="311" alt="Screenshot 2023-04-19 at 20 03 55"
src="https://user-images.githubusercontent.com/115237/233162109-faa616f6-02e4-43d3-95fa-66787a7f914c.png">

Co-authored-by: silverwind <me@silverwind.io>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 21, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
a4c41bb 
* giteaofficial/main:
  Fix label color, fix divider in dropdown (go-gitea#24215)
  [skip ci] Updated translations via Crowdin
  Refactor web route (go-gitea#24080)
  Fix unclear "Owner" concept (go-gitea#24233)
  Introduce eslint-plugin-no-jquery/no-event-shorthand (go-gitea#24198)
  Use secondary pointing menu for tabs on user/organization home page (go-gitea#24162)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jolheiser jolheiser jolheiser approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 topic/ui Change the appearance of the Gitea UI type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.20.0
Development

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