From 24019ef5e83fd7bed7f31ad09dd8d5f26b4bdc69 Mon Sep 17 00:00:00 2001 From: Luis Date: Sat, 3 Jan 2026 04:45:43 +0100 Subject: [PATCH] fix: pull request merge menu item clipping the auto merge tip (#10652) 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 Co-committed-by: Luis --- web_src/js/components/PullRequestMergeForm.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index e44e5bf02d..df123f5e2f 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -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);