ATProto Browser

ATProto Browser

Experimental browser for the Atmosphere

Record data

{
  "uri": "at://did:plc:qfpnj4og54vl56wngdriaxug/sh.tangled.repo.pull/3loj4v4dkad22",
  "cid": "bafyreicbuod6thyawbbptopkr6w6xu6q46hhm54swtjwenkxihwdhll6fm",
  "value": {
    "$type": "sh.tangled.repo.pull",
    "patch": "From 223ac055ba2b65ef644b8e460e5d88e32fc6f292 Mon Sep 17 00:00:00 2001\nFrom: Akshay <nerdy@peppe.rs>\nDate: Tue, 6 May 2025 15:19:56 +0100\nSubject: [PATCH] appview: pulls: unify styles for fork-based pulls\n\nthe pull-source information chip displayed `fork branch` but the two\nbits of information were styled differently.\n\nthis patch unifies the styles, moves both bits of info into the same\npill, styles them identically, and uses a `:` to separate them\n`fork:branch`.\n---\n .../repo/pulls/fragments/pullHeader.html      | 20 ++++++++---------\n appview/pages/templates/repo/pulls/pulls.html | 22 +++++++++----------\n 2 files changed, 19 insertions(+), 23 deletions(-)\n\ndiff --git a/appview/pages/templates/repo/pulls/fragments/pullHeader.html b/appview/pages/templates/repo/pulls/fragments/pullHeader.html\nindex 49a2498..3b9dbe9 100644\n--- a/appview/pages/templates/repo/pulls/fragments/pullHeader.html\n+++ b/appview/pages/templates/repo/pulls/fragments/pullHeader.html\n@@ -42,19 +42,17 @@\n               </span>\n             </span>\n             {{ if not .Pull.IsPatchBased }}\n-            <span>from\n-              {{ if .Pull.IsForkBased }}\n-                {{ if .Pull.PullSource.Repo }}\n-                <a href=\"/{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}\" class=\"no-underline hover:underline\">{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}</a>\n-                {{ else }}\n-                <span class=\"italic\">[deleted fork]</span>\n-                {{ end }}\n-              {{ end }}\n-\n+              from\n               <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\">\n-                {{ .Pull.PullSource.Branch }}\n+                {{ if .Pull.IsForkBased }}\n+                  {{ if .Pull.PullSource.Repo }}\n+                  <a href=\"/{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}\" class=\"no-underline hover:underline\">{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}</a>:\n+                  {{- else -}}\n+                  <span class=\"italic\">[deleted fork]</span>\n+                  {{- end -}}\n+                {{- end -}}\n+                {{- .Pull.PullSource.Branch -}}\n               </span>\n-            </span>\n             {{ end }}\n         </span>\n     </div>\ndiff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html\nindex fea5f6e..6db62e1 100644\n--- a/appview/pages/templates/repo/pulls/pulls.html\n+++ b/appview/pages/templates/repo/pulls/pulls.html\n@@ -79,18 +79,16 @@\n                         </span>\n                     </span>\n                     {{ if not .IsPatchBased }}\n-                    <span>from\n-                      {{ if .IsForkBased }}\n-                        {{ if .PullSource.Repo }}\n-                        <a href=\"/{{ $owner }}/{{ .PullSource.Repo.Name }}\" class=\"no-underline hover:underline\">{{ $owner }}/{{ .PullSource.Repo.Name }}</a>\n-                        {{ else }}\n-                        <span class=\"italic\">[deleted fork]</span>\n-                        {{ end }}\n-                      {{ end }}\n-\n-                      <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\">\n-                        {{ .PullSource.Branch }}\n-                      </span>\n+                    from\n+                    <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\">\n+                        {{ if .IsForkBased }}\n+                          {{ if .PullSource.Repo }}\n+                          <a href=\"/{{ $owner }}/{{ .PullSource.Repo.Name }}\" class=\"no-underline hover:underline\">{{ $owner }}/{{ .PullSource.Repo.Name }}</a>:\n+                          {{- else -}}\n+                          <span class=\"italic\">[deleted fork]</span>\n+                          {{- end -}}\n+                        {{- end -}}\n+                        {{- .PullSource.Branch -}}\n                     </span>\n                     {{ end }}\n                     <span class=\"before:content-['·']\">\n-- \n2.43.0\n\n",
    "title": "appview: pulls: unify styles for fork-based pulls",
    "pullId": 78,
    "source": {
      "branch": "pull-from-fork-pill"
    },
    "createdAt": "",
    "targetRepo": "at://did:plc:wshs7t2adsemcrrd4snkeqli/sh.tangled.repo/3liuighjy2h22",
    "targetBranch": "master"
  }
}