Monorepo for Tangled
at 74318eac9fdd72cf69e916276814351931ed0dcb 614 lines 24 kB view raw
1{{ define "title" }} 2 {{ .Pull.Title }} &middot; pull #{{ .Pull.PullId }} &middot; {{ .RepoInfo.FullName }} 3{{ end }} 4 5{{ define "extrameta" }} 6 {{ template "repo/pulls/fragments/og" (dict "RepoInfo" .RepoInfo "Pull" .Pull) }} 7{{ end }} 8 9{{ define "mainLayout" }} 10 <div class="px-1 flex-grow flex flex-col gap-4"> 11 <div class="max-w-full md:max-w-screen-lg mx-auto"> 12 {{ block "contentLayout" . }} 13 {{ block "content" . }}{{ end }} 14 {{ end }} 15 </div> 16 {{ block "contentAfterLayout" . }} 17 <main> 18 {{ block "contentAfter" . }}{{ end }} 19 </main> 20 {{ end }} 21 </div> 22 <script> 23 (function() { 24 const details = document.getElementById('bottomSheet'); 25 const backdrop = document.getElementById('bottomSheetBackdrop'); 26 const isDesktop = () => window.matchMedia('(min-width: 768px)').matches; 27 28 // function to update backdrop 29 const updateBackdrop = () => { 30 if (backdrop) { 31 if (details.open && !isDesktop()) { 32 backdrop.classList.remove('opacity-0', 'pointer-events-none'); 33 backdrop.classList.add('opacity-100', 'pointer-events-auto'); 34 document.body.style.overflow = 'hidden'; 35 } else { 36 backdrop.classList.remove('opacity-100', 'pointer-events-auto'); 37 backdrop.classList.add('opacity-0', 'pointer-events-none'); 38 document.body.style.overflow = ''; 39 } 40 } 41 }; 42 43 // close on mobile initially 44 if (!isDesktop()) { 45 details.open = false; 46 } 47 updateBackdrop(); // initialize backdrop 48 49 // prevent closing on desktop 50 details.addEventListener('toggle', function(e) { 51 if (isDesktop() && !this.open) { 52 this.open = true; 53 } 54 updateBackdrop(); 55 }); 56 57 const mediaQuery = window.matchMedia('(min-width: 768px)'); 58 mediaQuery.addEventListener('change', function(e) { 59 if (e.matches) { 60 // switched to desktop - keep open 61 details.open = true; 62 } else { 63 // switched to mobile - close 64 details.open = false; 65 } 66 updateBackdrop(); 67 }); 68 69 // close when clicking backdrop 70 if (backdrop) { 71 backdrop.addEventListener('click', () => { 72 if (!isDesktop()) { 73 details.open = false; 74 } 75 }); 76 } 77 })(); 78 </script> 79{{ end }} 80 81{{ define "repoContentLayout" }} 82 <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full"> 83 <section class="bg-white col-span-1 md:col-span-8 dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white h-full flex-shrink"> 84 {{ block "repoContent" . }}{{ end }} 85 </section> 86 <div class="flex flex-col gap-6 col-span-1 md:col-span-2"> 87 {{ template "repo/fragments/labelPanel" 88 (dict "RepoInfo" $.RepoInfo 89 "Defs" $.LabelDefs 90 "Subject" $.Pull.AtUri 91 "State" $.Pull.Labels) }} 92 {{ template "repo/fragments/participants" $.Pull.Participants }} 93 {{ template "repo/fragments/backlinks" 94 (dict "RepoInfo" $.RepoInfo 95 "Backlinks" $.Backlinks) }} 96 {{ template "repo/fragments/externalLinkPanel" $.Pull.AtUri }} 97 </div> 98 </div> 99{{ end }} 100 101{{ define "contentAfter" }} 102 {{ template "repo/fragments/diff" (list .Diff .DiffOpts $) }} 103{{ end }} 104 105{{ define "repoContent" }} 106 {{ template "repo/pulls/fragments/pullHeader" . }} 107 {{ if .Pull.IsStacked }} 108 <div class="mt-8"> 109 {{ template "repo/pulls/fragments/pullStack" . }} 110 </div> 111 {{ end }} 112{{ end }} 113 114{{ define "resize-grip" }} 115 {{ $id := index . 0 }} 116 {{ $target := index . 1 }} 117 {{ $direction := index . 2 }} 118 <div id="{{ $id }}" 119 data-resizer="vertical" 120 data-target="{{ $target }}" 121 data-direction="{{ $direction }}" 122 class="resizer-vertical hidden md:flex w-4 sticky top-12 max-h-screen flex-col items-center justify-center group"> 123 <div class="w-1 h-16 group-hover:h-24 group-[.resizing]:h-24 transition-all rounded-full bg-gray-400 dark:bg-gray-500 group-hover:bg-gray-500 group-hover:dark:bg-gray-400"></div> 124 </div> 125{{ end }} 126 127{{ define "diffLayout" }} 128 {{ $diff := index . 0 }} 129 {{ $opts := index . 1 }} 130 {{ $root := index . 2 }} 131 132 <div class="flex col-span-full"> 133 <!-- left panel --> 134 <div id="files" class="w-0 hidden md:block overflow-hidden sticky top-12 max-h-screen overflow-y-auto pb-12"> 135 <section class="overflow-x-auto text-sm px-6 py-2 border-b border-x border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded-b rounded-t-none bg-white dark:bg-gray-800 drop-shadow-sm"> 136 {{ template "repo/fragments/fileTree" $diff.FileTree }} 137 </section> 138 </div> 139 140 {{ template "resize-grip" (list "resize-files" "files" "before") }} 141 142 <!-- main content --> 143 <div id="diff-files" class="flex-1 min-w-0 sticky top-12 pb-12"> 144 {{ template "diffFiles" (list $diff $opts) }} 145 </div> 146 147 {{ template "resize-grip" (list "resize-subs" "subs" "after") }} 148 149 <!-- right panel --> 150 {{ template "subsPanel" $ }} 151 </div> 152{{ end }} 153 154{{ define "subsPanel" }} 155 {{ $root := index . 2 }} 156 {{ $pull := $root.Pull }} 157 <!-- backdrop overlay - only visible on mobile when open --> 158 <div id="bottomSheetBackdrop" class="fixed inset-0 bg-black/50 md:hidden opacity-0 pointer-events-none transition-opacity duration-300 z-40"></div> 159 <!-- right panel - bottom sheet on mobile, side panel on desktop --> 160 <div id="subs" class="fixed bottom-0 left-0 right-0 z-50 w-full md:static md:z-auto md:max-h-screen md:sticky md:top-12 overflow-hidden"> 161 <details open id="bottomSheet" class="rounded-t-2xl md:rounded-t drop-shadow-lg md:drop-shadow-none group/panel"> 162 <summary class=" 163 flex gap-4 items-center justify-between 164 rounded-t-2xl md:rounded-t cursor-pointer list-none p-4 md:h-12 165 text-white md:text-black md:dark:text-white 166 bg-green-600 dark:bg-green-700 167 md:bg-white md:dark:bg-gray-800 168 drop-shadow-sm 169 border-t md:border-x md:border-t-0 border-gray-200 dark:border-gray-700"> 170 <h2 class="">History</h2> 171 {{ template "subsPanelSummary" $ }} 172 </summary> 173 <div class="max-h-[85vh] md:max-h-[calc(100vh-3rem-3rem)] w-full flex flex-col-reverse gap-4 overflow-y-auto bg-slate-100 dark:bg-gray-900 md:bg-transparent"> 174 {{ template "submissions" $root }} 175 </div> 176 </details> 177 </div> 178{{ end }} 179 180{{ define "subsPanelSummary" }} 181 {{ $root := index . 2 }} 182 {{ $pull := $root.Pull }} 183 {{ $rounds := len $pull.Submissions }} 184 {{ $comments := $pull.TotalComments }} 185 <div class="flex items-center gap-2 text-sm"> 186 <span> 187 {{ $rounds }} round{{ if ne $rounds 1 }}s{{ end }} 188 </span> 189 <span class="select-none before:content-['\00B7']"></span> 190 <span> 191 {{ $comments }} comment{{ if ne $comments 1 }}s{{ end }} 192 </span> 193 194 <span class="md:hidden inline"> 195 <span class="inline group-open:hidden">{{ i "chevron-up" "size-4" }}</span> 196 <span class="hidden group-open:inline">{{ i "chevron-down" "size-4" }}</span> 197 </span> 198 </div> 199{{ end }} 200 201{{ define "subsCheckbox" }} 202 <input type="checkbox" id="subsToggle" class="peer/subs hidden" checked/> 203{{ end }} 204 205{{ define "subsToggle" }} 206 <style> 207 #subsToggle:checked ~ div div#subs { 208 width: 100%; 209 margin-left: 0; 210 } 211 #subsToggle:checked ~ div label[for="subsToggle"] .show-toggle { display: none; } 212 #subsToggle:checked ~ div label[for="subsToggle"] .hide-toggle { display: flex; } 213 #subsToggle:not(:checked) ~ div label[for="subsToggle"] .hide-toggle { display: none; } 214 215 @media (min-width: 768px) { 216 #subsToggle:checked ~ div div#subs { 217 width: 25vw; 218 max-width: 50vw; 219 } 220 #subsToggle:not(:checked) ~ div div#subs { 221 width: 0; 222 display: none; 223 margin-left: 0; 224 } 225 #subsToggle:not(:checked) ~ div div#resize-subs { 226 display: none; 227 } 228 } 229 </style> 230 <label title="Toggle review panel" for="subsToggle" class="hidden md:flex items-center justify-end rounded cursor-pointer"> 231 <span class="show-toggle">{{ i "message-square-more" "size-4" }}</span> 232 <span class="hide-toggle w-[25vw] flex justify-end">{{ i "message-square" "size-4" }}</span> 233 </label> 234{{ end }} 235 236 237{{ define "submissions" }} 238 {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 239 {{ if not .LoggedInUser }} 240 {{ template "loginPrompt" $ }} 241 {{ end }} 242 {{ range $ridx, $item := reverse .Pull.Submissions }} 243 {{ $idx := sub $lastIdx $ridx }} 244 {{ template "submission" (list $item $idx $lastIdx $) }} 245 {{ end }} 246{{ end }} 247 248{{ define "submission" }} 249 {{ $item := index . 0 }} 250 {{ $idx := index . 1 }} 251 {{ $lastIdx := index . 2 }} 252 {{ $root := index . 3 }} 253 {{ $round := $item.RoundNumber }} 254 <div class=" 255 w-full shadow-sm bg-gray-50 dark:bg-gray-900 border-2 border-t-0 256 {{ if eq $round 0 }}rounded-b{{ else }}rounded{{ end }} 257 {{ if eq $round $root.ActiveRound }} 258 border-blue-200 dark:border-blue-700 259 {{ else }} 260 border-gray-200 dark:border-gray-700 261 {{ end }} 262 "> 263 {{ template "submissionHeader" $ }} 264 {{ template "submissionComments" $ }} 265 </div> 266{{ end }} 267 268{{ define "submissionHeader" }} 269 {{ $item := index . 0 }} 270 {{ $lastIdx := index . 2 }} 271 {{ $root := index . 3 }} 272 {{ $round := $item.RoundNumber }} 273 <div class=" 274 {{ if eq $round 0 }}rounded-b{{ else }}rounded{{ end }} 275 px-6 py-4 pr-2 pt-2 276 bg-white dark:bg-gray-800 277 {{ if eq $round $root.ActiveRound }} 278 border-t-2 border-blue-200 dark:border-blue-700 279 {{ else }} 280 border-b-2 border-gray-200 dark:border-gray-700 281 {{ end }} 282 flex gap-2 sticky top-0 z-20"> 283 <!-- left column: just profile picture --> 284 <div class="flex-shrink-0 pt-2"> 285 {{ template "user/fragments/picLink" (list $root.Pull.OwnerDid "size-8") }} 286 </div> 287 <!-- right column --> 288 <div class="flex-1 min-w-0 flex flex-col gap-1"> 289 {{ template "submissionInfo" $ }} 290 {{ template "submissionCommits" $ }} 291 {{ template "submissionPipeline" $ }} 292 {{ if eq $lastIdx $round }} 293 {{ block "mergeCheck" $root }} {{ end }} 294 {{ end }} 295 </div> 296 </div> 297{{ end }} 298 299{{ define "submissionInfo" }} 300 {{ $item := index . 0 }} 301 {{ $idx := index . 1 }} 302 {{ $root := index . 3 }} 303 {{ $round := $item.RoundNumber }} 304 <div class="flex gap-2 items-center justify-between mb-1"> 305 <span class="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400 pt-2"> 306 {{ $handle := resolve $root.Pull.OwnerDid }} 307 <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="/{{ $handle }}">{{ $handle }}</a> 308 submitted 309 <span class="px-2 py-0.5 text-black dark:text-white bg-gray-100 dark:bg-gray-700 border-gray-300 dark:border-gray-600 rounded font-mono text-xs border"> 310 #{{ $round }} 311 </span> 312 <span class="select-none before:content-['\00B7']"></span> 313 <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ $round }}"> 314 {{ template "repo/fragments/shortTime" $item.Created }} 315 </a> 316 </span> 317 <div class="flex gap-2 items-center"> 318 {{ if ne $root.ActiveRound $round }} 319 <a class="btn-flat flex items-center gap-2 no-underline hover:no-underline text-sm" 320 href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $round }}?{{ safeUrl $root.DiffOpts.Encode }}#round-#{{ $round }}"> 321 {{ i "diff" "w-4 h-4" }} 322 diff 323 </a> 324 {{ end }} 325 {{ if ne $idx 0 }} 326 <a class="btn-flat flex items-center gap-2 no-underline hover:no-underline text-sm" 327 href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $round }}/interdiff?{{ safeUrl $root.DiffOpts.Encode }}"> 328 {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 329 interdiff 330 </a> 331 {{ end }} 332 </div> 333 </div> 334{{ end }} 335 336{{ define "submissionCommits" }} 337 {{ $item := index . 0 }} 338 {{ $root := index . 3 }} 339 {{ $round := $item.RoundNumber }} 340 {{ $patches := $item.AsFormatPatch }} 341 {{ if $patches }} 342 <details class="group/commit"> 343 <summary class="list-none cursor-pointer flex items-center gap-2"> 344 <span>{{ i "git-commit-horizontal" "w-4 h-4" }}</span> 345 {{ len $patches }} commit{{ if ne (len $patches) 1 }}s{{ end }} 346 <div class="text-sm text-gray-500 dark:text-gray-400"> 347 <span class="group-open/commit:hidden inline">expand</span> 348 <span class="hidden group-open/commit:inline">collapse</span> 349 </div> 350 </summary> 351 {{ range $patches }} 352 {{ template "submissionCommit" (list . $item $root) }} 353 {{ end }} 354 </details> 355 {{ end }} 356{{ end }} 357 358{{ define "submissionCommit" }} 359 {{ $patch := index . 0 }} 360 {{ $item := index . 1 }} 361 {{ $root := index . 2 }} 362 {{ $round := $item.RoundNumber }} 363 {{ with $patch }} 364 <div id="commit-{{.SHA}}" class="py-1 relative w-full md:max-w-3/5 md:w-fit flex flex-col text-gray-600 dark:text-gray-300"> 365 <div class="flex items-baseline gap-2"> 366 <div class="text-xs"> 367 <!-- attempt to resolve $fullRepo: this is possible only on non-deleted forks and branches --> 368 {{ $fullRepo := "" }} 369 {{ if and $root.Pull.IsForkBased $root.Pull.PullSource.Repo }} 370 {{ $fullRepo = printf "%s/%s" $root.Pull.OwnerDid $root.Pull.PullSource.Repo.Name }} 371 {{ else if $root.Pull.IsBranchBased }} 372 {{ $fullRepo = $root.RepoInfo.FullName }} 373 {{ end }} 374 375 <!-- if $fullRepo was resolved, link to it, otherwise just span without a link --> 376 {{ if $fullRepo }} 377 <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-600 dark:text-gray-300">{{ slice .SHA 0 8 }}</a> 378 {{ else }} 379 <span class="font-mono">{{ slice .SHA 0 8 }}</span> 380 {{ end }} 381 </div> 382 383 <div> 384 <span>{{ .Title | description }}</span> 385 {{ if gt (len .Body) 0 }} 386 <button 387 class="py-1/2 px-1 mx-2 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600" 388 hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" 389 > 390 {{ i "ellipsis" "w-3 h-3" }} 391 </button> 392 {{ end }} 393 {{ if gt (len .Body) 0 }} 394 <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 pb-2">{{ nl2br .Body }}</p> 395 {{ end }} 396 </div> 397 </div> 398 </div> 399 {{ end }} 400{{ end }} 401 402{{ define "mergeCheck" }} 403 {{ $isOpen := .Pull.State.IsOpen }} 404 {{ if and $isOpen .MergeCheck .MergeCheck.Error }} 405 <div class="flex items-center gap-2"> 406 {{ i "triangle-alert" "w-4 h-4 text-red-600 dark:text-red-500" }} 407 {{ .MergeCheck.Error }} 408 </div> 409 {{ else if and $isOpen .MergeCheck .MergeCheck.IsConflicted }} 410 <details class="group/conflict"> 411 <summary class="flex items-center justify-between cursor-pointer list-none"> 412 <div class="flex items-center gap-2 "> 413 {{ i "triangle-alert" "text-red-600 dark:text-red-500 w-4 h-4" }} 414 <span class="font-medium">merge conflicts detected</span> 415 <div class="text-sm text-gray-500 dark:text-gray-400"> 416 <span class="group-open/conflict:hidden inline">expand</span> 417 <span class="hidden group-open/conflict:inline">collapse</span> 418 </div> 419 </div> 420 </summary> 421 {{ if gt (len .MergeCheck.Conflicts) 0 }} 422 <ul class="space-y-1 mt-2 overflow-x-auto"> 423 {{ range .MergeCheck.Conflicts }} 424 {{ if .Filename }} 425 <li class="flex items-center whitespace-nowrap"> 426 {{ i "file-warning" "inline-flex w-4 h-4 mr-1.5 text-red-600 dark:text-red-500 flex-shrink-0" }} 427 <span class="font-mono">{{ .Filename }}</span> 428 </li> 429 {{ else if .Reason }} 430 <li class="flex items-center whitespace-nowrap"> 431 {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-600 dark:text-red-500 " }} 432 <span>{{.Reason}}</span> 433 </li> 434 {{ end }} 435 {{ end }} 436 </ul> 437 {{ end }} 438 </details> 439 {{ else if and $isOpen .MergeCheck }} 440 <div class="flex items-center gap-2"> 441 {{ i "check" "w-4 h-4 text-green-600 dark:text-green-500" }} 442 <span>no conflicts, ready to merge</span> 443 </div> 444 {{ end }} 445{{ end }} 446 447{{ define "mergeStatus" }} 448 {{ if .Pull.State.IsClosed }} 449 <div class="bg-gray-50 dark:bg-gray-700 border border-black dark:border-gray-500 rounded drop-shadow-sm px-6 py-2 relative"> 450 <div class="flex items-center gap-2 text-black dark:text-white"> 451 {{ i "ban" "w-4 h-4" }} 452 <span class="font-medium">closed without merging</span 453 > 454 </div> 455 </div> 456 {{ else if .Pull.State.IsMerged }} 457 <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative"> 458 <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> 459 {{ i "git-merge" "w-4 h-4" }} 460 <span class="font-medium">pull request successfully merged</span 461 > 462 </div> 463 </div> 464 {{ else if .Pull.State.IsDeleted }} 465 <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 466 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 467 {{ i "git-pull-request-closed" "w-4 h-4" }} 468 <span class="font-medium">This pull has been deleted (possibly by jj abandon or jj squash)</span> 469 </div> 470 </div> 471 {{ end }} 472{{ end }} 473 474{{ define "resubmitStatus" }} 475 {{ if .ResubmitCheck.Yes }} 476 <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative"> 477 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 478 {{ i "triangle-alert" "w-4 h-4" }} 479 <span class="font-medium">this branch has been updated, consider resubmitting</span> 480 </div> 481 </div> 482 {{ end }} 483{{ end }} 484 485{{ define "submissionPipeline" }} 486 {{ $item := index . 0 }} 487 {{ $root := index . 3 }} 488 {{ $pipeline := index $root.Pipelines $item.SourceRev }} 489 {{ with $pipeline }} 490 {{ $id := .Id }} 491 {{ if .Statuses }} 492 <details class="group/pipeline"> 493 <summary class="cursor-pointer list-none flex items-center gap-2"> 494 {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" false) }} 495 <div class="text-sm text-gray-500 dark:text-gray-400"> 496 <span class="group-open/pipeline:hidden inline">expand</span> 497 <span class="hidden group-open/pipeline:inline">collapse</span> 498 </div> 499 </summary> 500 <div class="my-2 grid grid-cols-1 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700"> 501 {{ range $name, $all := .Statuses }} 502 <a href="/{{ $root.RepoInfo.FullName }}/pipelines/{{ $id }}/workflow/{{ $name }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 503 <div 504 class="flex gap-2 items-center justify-between p-2"> 505 {{ $lastStatus := $all.Latest }} 506 {{ $kind := $lastStatus.Status.String }} 507 508 <div id="left" class="flex items-center gap-2 flex-shrink-0"> 509 {{ template "repo/pipelines/fragments/workflowSymbol" $all }} 510 {{ $name }} 511 </div> 512 <div id="right" class="flex items-center gap-2 flex-shrink-0"> 513 <span class="font-bold">{{ $kind }}</span> 514 {{ if .TimeTaken }} 515 {{ template "repo/fragments/duration" .TimeTaken }} 516 {{ else }} 517 {{ template "repo/fragments/shortTimeAgo" $lastStatus.Created }} 518 {{ end }} 519 </div> 520 </div> 521 </a> 522 {{ end }} 523 </div> 524 </details> 525 {{ end }} 526 {{ end }} 527{{ end }} 528 529{{ define "submissionComments" }} 530 {{ $item := index . 0 }} 531 {{ $idx := index . 1 }} 532 {{ $lastIdx := index . 2 }} 533 {{ $root := index . 3 }} 534 {{ $round := $item.RoundNumber }} 535 {{ $c := len $item.Comments }} 536 <details class="relative ml-10 group/comments" {{ if or (eq $c 0) (eq $root.ActiveRound $round) }}open{{ end }}> 537 <summary class="cursor-pointer list-none"> 538 <div class="hidden group-open/comments:block absolute -left-8 top-0 bottom-0 w-16 transition-colors flex items-center justify-center group/border z-4"> 539 <div class="absolute left-1/2 -translate-x-1/2 top-0 bottom-0 w-0.5 group-open/comments:bg-gray-200 dark:group-open/comments:bg-gray-700 group-hover/border:bg-gray-400 dark:group-hover/border:bg-gray-500 transition-colors"> </div> 540 </div> 541 <div class="group-open/comments:hidden block relative group/summary py-4"> 542 <div class="absolute -left-8 top-0 bottom-0 w-16 transition-colors flex items-center justify-center z-4"> 543 <div class="absolute left-1/2 -translate-x-1/2 h-1/3 top-0 bottom-0 w-0.5 bg-gray-200 dark:bg-gray-700 group-hover/summary:bg-gray-400 dark:group-hover/summary:bg-gray-500 transition-colors"></div> 544 </div> 545 <span class="text-gray-500 dark:text-gray-400 text-sm group-hover/summary:text-gray-600 dark:group-hover/summary:text-gray-300 transition-colors flex items-center gap-2 -ml-2 relative"> 546 {{ i "circle-plus" "size-4 z-5" }} 547 expand {{ $c }} comment{{ if ne $c 1 }}s{{ end }} 548 </span> 549 </div> 550 </summary> 551 <div> 552 {{ range $item.Comments }} 553 {{ template "submissionComment" . }} 554 {{ end }} 555 </div> 556 557 <div class="relative -ml-10"> 558 {{ if eq $lastIdx $item.RoundNumber }} 559 {{ block "mergeStatus" $root }} {{ end }} 560 {{ block "resubmitStatus" $root }} {{ end }} 561 {{ end }} 562 </div> 563 <div class="relative -ml-10 bg-gray-50 dark:bg-gray-900"> 564 {{ if $root.LoggedInUser }} 565 {{ template "repo/pulls/fragments/pullActions" 566 (dict 567 "LoggedInUser" $root.LoggedInUser 568 "Pull" $root.Pull 569 "RepoInfo" $root.RepoInfo 570 "RoundNumber" $item.RoundNumber 571 "MergeCheck" $root.MergeCheck 572 "ResubmitCheck" $root.ResubmitCheck 573 "BranchDeleteStatus" $root.BranchDeleteStatus 574 "Stack" $root.Stack) }} 575 {{ end }} 576 </div> 577 </details> 578{{ end }} 579 580{{ define "submissionComment" }} 581 <div id="comment-{{.ID}}" class="flex gap-2 -ml-4 py-4 w-full mx-auto"> 582 <!-- left column: profile picture --> 583 <div class="flex-shrink-0 h-fit relative"> 584 {{ template "user/fragments/picLink" (list .OwnerDid "size-8") }} 585 </div> 586 <!-- right column: name and body in two rows --> 587 <div class="flex-1 min-w-0"> 588 <!-- Row 1: Author and timestamp --> 589 <div class="text-sm text-gray-500 dark:text-gray-400 flex items-center gap-1"> 590 {{ $handle := resolve .OwnerDid }} 591 <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="/{{ $handle }}">{{ $handle }}</a> 592 <span class="before:content-['·']"></span> 593 <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}"> 594 {{ template "repo/fragments/shortTime" .Created }} 595 </a> 596 </div> 597 <!-- Row 2: Body text --> 598 <div class="prose dark:prose-invert mt-1"> 599 {{ .Body | markdown }} 600 </div> 601 </div> 602 </div> 603{{ end }} 604 605{{ define "loginPrompt" }} 606 <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm p-2 relative flex gap-2 items-center"> 607 <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 608 sign up 609 </a> 610 <span class="text-gray-500 dark:text-gray-400">or</span> 611 <a href="/login" class="underline">login</a> 612 to add to the discussion 613 </div> 614{{ end }}