Fix long branch name overflows by silverwind · Pull Request #30345 · go-gitea/gitea

silverwind · 2024-04-08T22:20:30Z

Fixes: #27971
Fixes: #28010

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

yp05327 · 2024-04-10T02:21:52Z

In this file:

should also make some changes.

silverwind · 2024-04-13T15:02:34Z

Fixed that one as well:

silverwind · 2024-04-14T20:13:01Z

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

* 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 · 2024-04-15T19:50:17Z

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).

wxiaoguang

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

silverwind · 2024-04-16T08:28:45Z

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.

GiteaBot · 2024-04-16T08:52:51Z

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

* 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)

Follow #30345 Follow #30547 `ellipsis` / `white-space` shouldn't be put on the general dropdown components.

Follow go-gitea#30345 Follow go-gitea#30547 `ellipsis` / `white-space` shouldn't be put on the general dropdown components.

Backport #30849 by wxiaoguang Follow #30345 Follow #30547 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

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.

…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>

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 bot added the size/S label Apr 8, 2024

github-actions bot added modifies/templates This PR modifies the template files modifies/js labels Apr 8, 2024

silverwind added type/bug backport/v1.22 labels Apr 8, 2024

Fix long branch name overflow in branch selector and issue list

3cccaba

silverwind force-pushed the longbranch branch from da09c41 to 3cccaba Compare April 8, 2024 22:22

lunny added this to the 1.23.0 milestone Apr 9, 2024

lunny approved these changes Apr 9, 2024

View reviewed changes

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

silverwind marked this pull request as draft April 11, 2024 18:36

silverwind added 3 commits April 13, 2024 16:32

Merge branch 'main' into longbranch

4f4b091

fix branch tag with org source

2bc6dab

fix in branch selector as well

19f2cc3

pull-request-size bot added size/M and removed size/S labels Apr 13, 2024

silverwind added 2 commits April 13, 2024 17:01

undo useless styles

e39de1d

comment

b074def

silverwind marked this pull request as ready for review April 13, 2024 15:02

silverwind requested review from delvh, wxiaoguang and yp05327 and removed request for delvh April 14, 2024 20:07

limit branch name length

f207d82

let branch selector button wrap

c833729

silverwind changed the title ~~Fix long branch name overflow in branch selector and issue list~~ Fix long branch name overflows Apr 15, 2024

use gt-ellipsis

0c9ff51

wxiaoguang approved these changes Apr 16, 2024

View reviewed changes

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 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 16, 2024

silverwind enabled auto-merge (squash) April 16, 2024 08:26

Merge branch 'main' into longbranch

5064871

silverwind merged commit a658e2f into go-gitea:main Apr 16, 2024

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

wxiaoguang mentioned this pull request Apr 23, 2024

Propose to restart 1.22 release #30501

Closed

11 tasks

silverwind deleted the longbranch branch April 23, 2024 18:05

wxiaoguang modified the milestones: 1.23.0, 1.22.0 Apr 27, 2024

wxiaoguang mentioned this pull request May 3, 2024

Fix some UI problems (dropdown/container) #30849

Merged

wxiaoguang added a commit that referenced this pull request May 6, 2024

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

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 mentioned this pull request May 6, 2024

Fix some UI problems (dropdown/container) (#30849) #30871

Merged

wxiaoguang added a commit that referenced this pull request May 6, 2024

Fix some UI problems (dropdown/container) (#30849) (#30871)

b22d7fd

Backport #30849 by wxiaoguang Follow #30345 Follow #30547 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

wxiaoguang removed backport/manual No power to the bots! Create your backport yourself! backport/v1.22 labels Jun 20, 2024

go-gitea locked as resolved and limited conversation to collaborators Jul 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix long branch name overflows#30345

Fix long branch name overflows#30345
silverwind merged 20 commits intogo-gitea:mainfrom
silverwind:longbranch

silverwind commented Apr 8, 2024

Uh oh!

yp05327 commented Apr 10, 2024

Uh oh!

silverwind commented Apr 13, 2024 •

edited

Loading

Uh oh!

silverwind commented Apr 14, 2024 •

edited

Loading

Uh oh!

silverwind commented Apr 15, 2024

Uh oh!

wxiaoguang left a comment

Uh oh!

silverwind commented Apr 16, 2024

Uh oh!

GiteaBot commented Apr 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

silverwind commented Apr 8, 2024

Uh oh!

yp05327 commented Apr 10, 2024

Uh oh!

silverwind commented Apr 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

silverwind commented Apr 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

silverwind commented Apr 15, 2024

Uh oh!

wxiaoguang left a comment

Choose a reason for hiding this comment

Uh oh!

silverwind commented Apr 16, 2024

Uh oh!

GiteaBot commented Apr 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

silverwind commented Apr 13, 2024 •

edited

Loading

silverwind commented Apr 14, 2024 •

edited

Loading