From 303832e9ab8954961eb0d0b5f891cfd8c4a4ab3c Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Tue, 6 May 2025 15:19:56 +0100
Subject: [PATCH] appview: pulls: unify styles for fork-based pulls

the pull-source information chip displayed `fork branch` but the two
bits of information were styled differently.

this patch unifies the styles, moves both bits of info into the same
pill, styles them identically, and uses a `:` to separate them
`fork:branch`.
---
 .../repo/pulls/fragments/pullHeader.html      | 20 ++++++++---------
 appview/pages/templates/repo/pulls/pulls.html | 22 +++++++++----------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/appview/pages/templates/repo/pulls/fragments/pullHeader.html b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
index 49a2498..3b9dbe9 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullHeader.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
@@ -42,19 +42,17 @@
               </span>
             </span>
             {{ if not .Pull.IsPatchBased }}
-            <span>from
-              {{ if .Pull.IsForkBased }}
-                {{ if .Pull.PullSource.Repo }}
-                <a href="/{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}</a>
-                {{ else }}
-                <span class="italic">[deleted fork]</span>
-                {{ end }}
-              {{ end }}
-
+              from
               <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">
-                {{ .Pull.PullSource.Branch }}
+                {{ if .Pull.IsForkBased }}
+                  {{ if .Pull.PullSource.Repo }}
+                  <a href="/{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}</a>:
+                  {{- else -}}
+                  <span class="italic">[deleted fork]</span>
+                  {{- end -}}
+                {{- end -}}
+                {{- .Pull.PullSource.Branch -}}
               </span>
-            </span>
             {{ end }}
         </span>
     </div>
diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html
index fea5f6e..6db62e1 100644
--- a/appview/pages/templates/repo/pulls/pulls.html
+++ b/appview/pages/templates/repo/pulls/pulls.html
@@ -79,18 +79,16 @@
                         </span>
                     </span>
                     {{ if not .IsPatchBased }}
-                    <span>from
-                      {{ if .IsForkBased }}
-                        {{ if .PullSource.Repo }}
-                        <a href="/{{ $owner }}/{{ .PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSource.Repo.Name }}</a>
-                        {{ else }}
-                        <span class="italic">[deleted fork]</span>
-                        {{ end }}
-                      {{ end }}
-
-                      <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">
-                        {{ .PullSource.Branch }}
-                      </span>
+                    from
+                    <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">
+                        {{ if .IsForkBased }}
+                          {{ if .PullSource.Repo }}
+                          <a href="/{{ $owner }}/{{ .PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSource.Repo.Name }}</a>:
+                          {{- else -}}
+                          <span class="italic">[deleted fork]</span>
+                          {{- end -}}
+                        {{- end -}}
+                        {{- .PullSource.Branch -}}
                     </span>
                     {{ end }}
                     <span class="before:content-['·']">
-- 
2.54.0