From bba9705871b49b0ff1a7a755d981facfe14dddef Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Fri, 24 Oct 2025 02:08:10 +0900 Subject: [PATCH] appview/pages: remove unneccessary wrapper div Change-Id: rvkkksrxnpsvozksponvskuyywqtoznt this unecessary div causes an error where the div is duplicated when multiple htmx requests are made. the diff might tell a lot, but all I'm doing here is just merging `div.relative` and `div#actions-%d` with some indent changes. also, I removed the `w-fit` style to give pull comments full width like issue comments have. Signed-off-by: Seongmin Lee --- .../repo/pulls/fragments/pullActions.html | 164 +++++++++--------- 1 file changed, 81 insertions(+), 83 deletions(-) diff --git a/appview/pages/templates/repo/pulls/fragments/pullActions.html b/appview/pages/templates/repo/pulls/fragments/pullActions.html index 2963e10a..ca9241a6 100644 --- a/appview/pages/templates/repo/pulls/fragments/pullActions.html +++ b/appview/pages/templates/repo/pulls/fragments/pullActions.html @@ -22,95 +22,93 @@ {{ $isLastRound := eq $roundNumber $lastIdx }} {{ $isSameRepoBranch := .Pull.IsBranchBased }} {{ $isUpToDate := .ResubmitCheck.No }} -
-
- - {{ if .BranchDeleteStatus }} - - {{ end }} - {{ if and $isPushAllowed $isOpen $isLastRound }} - {{ $disabled := "" }} - {{ if $isConflicted }} - {{ $disabled = "disabled" }} - {{ end }} - - {{ end }} +
+ + {{ if .BranchDeleteStatus }} + + {{ end }} + {{ if and $isPushAllowed $isOpen $isLastRound }} + {{ $disabled := "" }} + {{ if $isConflicted }} + {{ $disabled = "disabled" }} + {{ end }} + + {{ end }} - {{ if and $isPullAuthor $isOpen $isLastRound }} - {{ $disabled := "" }} - {{ if $isUpToDate }} - {{ $disabled = "disabled" }} + {{ if and $isPullAuthor $isOpen $isLastRound }} + {{ $disabled := "" }} + {{ if $isUpToDate }} + {{ $disabled = "disabled" }} + {{ end }} + - {{ end }} + {{ if $disabled }} + title="Update this branch to resubmit this pull request" + {{ else }} + title="Resubmit this pull request" + {{ end }} + > + {{ i "rotate-ccw" "w-4 h-4" }} + resubmit + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} + + {{ end }} - {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }} - - {{ end }} + {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }} + + {{ end }} - {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }} - - {{ end }} -
+ {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }} + + {{ end }}
{{ end }} -- 2.43.0