kyush/forgejo
1
0
Fork 0
forked from mirrors/forgejo
Code Pull requests Activity

fix: pull request merge menu item clipping the auto merge tip (#10652)

Browse source 
Fixes the auto merge tip not being properly displayed due to an `overflow: hidden` set at the `.item` level. The fix resets that overflow rule if the auto merge button is being hovered and goes back to `hidden` when no longer being hovered.

Fixed also a small misalignment between the tip and the button.

Resolves #4822

### Test

1. Go to a pull request that merges into a protected branch that requires status checks to pass.
2. Go to the merge area of that pull request.
3. Click on the "Create merge commit" button.
4. Hover over the clock icon.
5. Observe that some text appears to the right of that clock icon.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10652
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Luis <luis@adame.dev>
Co-committed-by: Luis <luis@adame.dev>
This commit is contained in:
Luis 2026-01-03 04:45:43 +01:00 • committed by Gusted
commit 24019ef5e8
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web_src/js/components/PullRequestMergeForm.vue
View file

@ -225,7 +225,7 @@ export default {
.auto-merge-small .auto-merge-tip {
display: none;
left: 38px;
top: -1px;
top: -0.5px;
bottom: -1px;
position: absolute;
align-items: center;
@ -236,6 +236,10 @@ export default {
padding-right: 1rem;
}
.menu .item:has(.auto-merge-small:hover) {
overflow: unset;
}
.auto-merge-small:hover {
color: var(--color-info-text);
background-color: var(--color-info-bg);