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 long branch name overflows #30345

Merged
merged 20 commits into from
Apr 16, 2024
Merged

Fix long branch name overflows #30345

merged 20 commits into from
Apr 16, 2024

Conversation

silverwind
Copy link
Member

Fixes: #27971
Fixes: #28010

Screenshot 2024-04-09 at 00 19 57

Also fixes a similar issue in issue list where CSS was there but not active because of missing display: block.

Screenshot 2024-04-09 at 00 18 25

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 8, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 8, 2024
@github-actions github-actions bot added modifies/templates This PR modifies the template files modifies/js labels Apr 8, 2024
@silverwind silverwind added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Apr 8, 2024
@lunny lunny added this to the 1.23.0 milestone Apr 9, 2024
@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 Apr 9, 2024
@yp05327
Copy link
Contributor

yp05327 commented Apr 10, 2024

In this file:
image
should also make some changes.

image

@silverwind silverwind marked this pull request as draft April 11, 2024 18:36
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 13, 2024
@silverwind
Copy link
Member Author

silverwind commented Apr 13, 2024 •
edited
Loading

Fixed that one as well:

image

@silverwind silverwind marked this pull request as ready for review April 13, 2024 15:02
@silverwind silverwind requested review from yp05327, delvh and wxiaoguang and removed request for delvh April 14, 2024 20:07
@silverwind
Copy link
Member Author

silverwind commented Apr 14, 2024 •
edited
Loading

This branch ref in issue list is now also limited in width:

Screenshot 2024-04-14 at 22 18 23

@silverwind
Merge remote-tracking branch 'origin/main' into longbranch
efa7943 
* origin/main:
  Improve flex ellipsis (go-gitea#30479)
  Remove fomantic button module (go-gitea#30475)
  Improve "must-change-password" logic and document (go-gitea#30472)
  Fix commitstatus summary (go-gitea#30431)
  Remove fomantic menu module (go-gitea#30325)
  Use `flex-container` for dashboard layout (go-gitea#30214)
  Rewrite and restyle reaction selector and enable no-sizzle eslint rule (go-gitea#30453)
  Pulse page improvements (go-gitea#30149)
  Fix JS error when opening to expanded code comment (go-gitea#30463)
  fix: Fix to delete cookie when AppSubURL is non-empty (go-gitea#30375)
  Add `interface{}` to `any` replacement to `make fmt`, exclude `*.pb.go` (go-gitea#30461)
  Fix network error when open/close organization/individual projects and redirect to project page (go-gitea#30387)
  Avoid losing token when updating mirror settings (go-gitea#30429)
@silverwind silverwind changed the title Fix long branch name overflow in branch selector and issue list Fix long branch name overflows Apr 15, 2024
@silverwind
Copy link
Member Author

So I reverted all these "dropdown button" styles and just use gt-ellipsis on that button now. Global button changes will come later (and eliminate line-height: 1).

image

wxiaoguang
wxiaoguang approved these changes Apr 16, 2024
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

Using "button" inside "dropdown" seems an abuse. It could not be in this PR's scope and be refactored later.

@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 16, 2024
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 16, 2024
@silverwind silverwind enabled auto-merge (squash) April 16, 2024 08:26
@silverwind
Copy link
Member Author

Using "button" inside "dropdown" seems an abuse. It could not be in this PR's scope and be refactored later.

Indeed, likely it should be https://fomantic-ui.com/modules/dropdown.html#selection.

@silverwind silverwind merged commit a658e2f into go-gitea:main Apr 16, 2024
26 checks passed
@GiteaBot
Copy link
Contributor

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

go run ./contrib/backport 30345
...  // 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 Apr 16, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 17, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
357aec6 
* giteaofficial/main:
  Reduce unnecessary database queries on actions table (go-gitea#30509)
  [skip ci] Updated translations via Crowdin
  Tweak and fix toggle checkboxes (go-gitea#30527)
  Tweak repo buttons on mobile and labeled button border-radius (go-gitea#30503)
  Fix long branch name overflows (go-gitea#30345)
  Update API to return 'source_id' for users (go-gitea#29718)
  Allow `preferred_username` as username source for OIDC (go-gitea#30454)
  Fix empty field `login_name` in API response JSON when creating user (go-gitea#30511)
  feat(api): implement branch/commit comparison API (go-gitea#30349)
@wxiaoguang wxiaoguang mentioned this pull request Apr 23, 2024
Closed
11 tasks
@silverwind silverwind deleted the longbranch branch April 23, 2024 18:05
@wxiaoguang wxiaoguang modified the milestones: 1.23.0, 1.22.0 Apr 27, 2024
@wxiaoguang wxiaoguang mentioned this pull request May 3, 2024
Merged
wxiaoguang added a commit that referenced this pull request May 6, 2024
@wxiaoguang
Fix some UI problems (dropdown/container) (#30849)
eda10cc 
Follow #30345
Follow #30547

`ellipsis` / `white-space` shouldn't be put on the general dropdown components.
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 6, 2024
@wxiaoguang @GiteaBot
Fix some UI problems (dropdown/container) (go-gitea#30849)
08a9dc5 
Follow go-gitea#30345
Follow go-gitea#30547

`ellipsis` / `white-space` shouldn't be put on the general dropdown components.
@GiteaBot GiteaBot mentioned this pull request May 6, 2024
Merged
wxiaoguang added a commit that referenced this pull request May 6, 2024
@GiteaBot @wxiaoguang
Fix some UI problems (dropdown/container) (#30849) (#30871)
b22d7fd 
Backport #30849 by wxiaoguang

Follow #30345
Follow #30547

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
DennisRasey pushed a commit to DennisRasey/forgejo that referenced this pull request May 27, 2024
@silverwind
Fix long branch name overflows (go-gitea/gitea#30345)
f6c1fd7 
Fixes: go-gitea/gitea#27971
Fixes: go-gitea/gitea#28010

<img width="689" alt="Screenshot 2024-04-09 at 00 19 57"
src="https://github.com/go-gitea/gitea/assets/115237/7c895a47-274f-40a6-a126-290658f1982d">

Also fixes a similar issue in issue list where CSS was there but not
active because of missing `display: block`.

<img width="372" alt="Screenshot 2024-04-09 at 00 18 25"
src="https://github.com/go-gitea/gitea/assets/115237/cfbee7cd-2e15-4ac7-96ce-020816f48798">

---
Little conflict in branch_selector_field (repo.pulls.no_results is renamed in Gitea)
And some weird conflict on new CSS rules added.
DennisRasey pushed a commit to DennisRasey/forgejo that referenced this pull request May 27, 2024
Merge pull request 'Port: Fix long branch name overflows (go-gitea/gi…
b6849b8 
…tea#30345)' (#3890) from 0ko/forgejo:fix-branch-overflow-2 into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3890
Reviewed-by: Beowulf <beowulf@noreply.codeberg.org>
@wxiaoguang wxiaoguang removed backport/manual No power to the bots! Create your backport yourself! backport/v1.22 This PR should be backported to Gitea 1.22 labels Jun 20, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lunny lunny lunny approved these changes

@yp05327 yp05327 Awaiting requested review from yp05327

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/js modifies/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Long name branch/tag display problem in repo home page
5 participants
@silverwind @yp05327 @GiteaBot @lunny @wxiaoguang