forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
appview/pages: be consistent about rounds; rename panel to Submissions
Some more conditional styling for rounding. Makes it look more cohesive.
Signed-off-by: Anirudh Oppiliappan <anirudh@tangled.org>
+7
-4
+7
-4
appview/pages/templates/repo/pulls/pull.html
+7
-4
appview/pages/templates/repo/pulls/pull.html
···
123
123
flex gap-4 items-center justify-between
124
124
rounded-t-2xl md:rounded-t cursor-pointer list-none p-4 md:h-12
125
125
text-white md:text-black md:dark:text-white
126
-
bg-green-600 dark:bg-green-600
126
+
bg-green-600 dark:bg-green-700
127
127
md:bg-white md:dark:bg-gray-800
128
128
drop-shadow-sm
129
129
border-t md:border-x md:border-t-0 border-gray-200 dark:border-gray-700">
···
218
218
{{ $idx := index . 1 }}
219
219
{{ $lastIdx := index . 2 }}
220
220
{{ $root := index . 3 }}
221
-
<div class="rounded border border-gray-200 dark:border-gray-700 w-full shadow-sm bg-gray-50 dark:bg-gray-800/50">
221
+
<div class="{{ if eq $item.RoundNumber 0 }}rounded-b border-t-0{{ else }}rounded{{ end }} border border-gray-200 dark:border-gray-700 w-full shadow-sm bg-gray-50 dark:bg-gray-800/50">
222
222
{{ template "submissionHeader" $ }}
223
223
{{ template "submissionComments" $ }}
224
224
···
249
249
{{ $lastIdx := index . 2 }}
250
250
{{ $root := index . 3 }}
251
251
{{ $round := $item.RoundNumber }}
252
-
<div class="rounded px-6 py-4 pr-2 pt-2 bg-white dark:bg-gray-800 flex gap-2 sticky top-0 z-20 border-b border-gray-200 dark:border-gray-700">
252
+
<div class="{{ if eq $round 0 }}rounded-b{{ else }}rounded{{ end }} px-6 py-4 pr-2 pt-2 {{ if eq $root.ActiveRound $round }}bg-blue-100 dark:bg-blue-900/50 border-b border-blue-200 dark:border-blue-700{{ else }}bg-white dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700{{ end }} flex gap-2 sticky top-0 z-20">
253
253
<!-- left column: just profile picture -->
254
254
<div class="flex-shrink-0 pt-2">
255
255
<img
···
277
277
{{ $round := $item.RoundNumber }}
278
278
<div class="flex gap-2 items-center justify-between mb-1">
279
279
<span class="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400 pt-2">
280
-
{{ resolve $root.Pull.OwnerDid }} submitted v{{ $round }}
280
+
{{ resolve $root.Pull.OwnerDid }} submitted
281
+
<span class="px-2 py-0.5 {{ if eq $root.ActiveRound $round }}text-white bg-blue-600 dark:bg-blue-500 border-blue-700 dark:border-blue-600{{ else }}text-black dark:text-white bg-gray-100 dark:bg-gray-700 border-gray-300 dark:border-gray-600{{ end }} rounded font-mono text-xs border">
282
+
#{{ $round }}
283
+
</span>
281
284
<span class="select-none before:content-['\00B7']"></span>
282
285
<a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ $round }}">
283
286
{{ template "repo/fragments/shortTimeAgo" $item.Created }}