Monorepo for Tangled tangled.org
856
fork

Configure Feed

Select the types of activity you want to include in your feed.

appview/pulls/new: tweak border and background color of elements #327

open opened by eti.tf targeting master from eti.tf/core-2: eti/pr-creation-page-nits
Labels

None yet.

assignee

None yet.

Participants 1
AT URI
at://did:plc:xu5apv6kmu5jp7g5hwdnej42/sh.tangled.repo.pull/3ml2lg6bzqz22
+25 -25
Diff #0
+1 -1
appview/pages/templates/knots/index.html
··· 79 79 name="domain" 80 80 placeholder="knot.example.com" 81 81 required 82 - class="flex-1 w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-3 py-2 border rounded" 82 + class="flex-1 w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 dark:placeholder-gray-400 px-3 py-2 border rounded" 83 83 > 84 84 <button 85 85 type="submit"
+1 -1
appview/pages/templates/repo/fragments/diffOpts.html
··· 12 12 {{ $field := .Field }} 13 13 {{ if eq $field "" }}{{ $field = "diff" }}{{ end }} 14 14 15 - <div class="inline-flex items-center gap-1 p-1 bg-slate-100 dark:bg-gray-900 rounded-md text-gray-600 dark:text-gray-300" 15 + <div class="inline-flex items-center gap-1 p-1 bg-slate-100 dark:bg-gray-900 rounded-md text-gray-600 dark:text-gray-300 border dark:border-gray-700" 16 16 hx-on::before-request="const t=event.target.closest('button'); if(!t||t.classList.contains('shadow-sm'))return event.preventDefault(); this.querySelectorAll('button').forEach(b => { const active=b===t; b.classList.toggle('bg-white',active); b.classList.toggle('dark:bg-gray-800',active); b.classList.toggle('shadow-sm',active); b.classList.toggle('cursor-default',active); b.classList.toggle('hover:text-gray-900',!active); b.classList.toggle('dark:hover:text-white',!active); })"> 17 17 <button 18 18 {{ if $usePost }}
+3 -3
appview/pages/templates/repo/new.html
··· 111 111 id="description" 112 112 name="description" 113 113 maxlength="140" 114 - class="w-full w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2" 114 + class="w-full w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 border border-gray-300 rounded px-3 py-2" 115 115 placeholder="A brief description of your project..." 116 116 /> 117 117 <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> ··· 132 132 name="branch" 133 133 value="main" 134 134 required 135 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2" 135 + class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 border border-gray-300 rounded px-3 py-2" 136 136 /> 137 137 <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 138 138 The primary branch where development happens. Common choices are "main" or "master". ··· 146 146 <label class="block text-sm font-bold uppercase dark:text-white mb-1"> 147 147 Select a knot 148 148 </label> 149 - <div class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded p-3 space-y-2"> 149 + <div class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 border border-gray-300 rounded p-3 space-y-2"> 150 150 {{ range .Knots }} 151 151 <div class="flex items-center"> 152 152 <input
+1 -1
appview/pages/templates/repo/pulls/fragments/pullPatchUpload.html
··· 19 19 name="patch" 20 20 id="patch" 21 21 rows="12" 22 - class="w-full mt-2 resize-y font-mono dark:bg-gray-700 dark:text-white dark:border-gray-600" 22 + class="w-full mt-2 resize-y font-mono dark:bg-gray-800 dark:text-white dark:border-gray-700" 23 23 placeholder="diff --git a/file.txt b/file.txt 24 24 index 1234567..abcdefg 100644 25 25 --- a/file.txt
+3 -3
appview/pages/templates/repo/pulls/fragments/pullStepDetails.html
··· 30 30 name="title" 31 31 id="title" 32 32 value="{{ $root.Title }}" 33 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600" 33 + class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700" 34 34 placeholder="One-line summary of your change." 35 35 /> 36 36 </div> ··· 54 54 {{ $previewUrl := .PreviewUrl }} 55 55 <div class="flex flex-col gap-2" data-md-editor="{{ $id }}"> 56 56 {{ $tabClasses := "group flex items-center gap-2 px-3 py-1 text-sm whitespace-nowrap rounded hover:no-underline data-[active=true]:bg-white data-[active=true]:dark:bg-gray-800 data-[active=true]:shadow-sm data-[active=true]:cursor-default data-[active=false]:hover:text-gray-900 data-[active=false]:dark:hover:text-white" }} 57 - <div class="inline-flex items-center gap-1 p-1 bg-slate-100 dark:bg-gray-900 rounded-md text-gray-600 dark:text-gray-300 self-start"> 57 + <div class="inline-flex items-center gap-1 p-1 bg-slate-100 dark:bg-gray-900 rounded-md text-gray-600 dark:text-gray-300 self-start border dark:border-gray-700"> 58 58 <button type="button" data-md-mode="write" 59 59 data-active="true" 60 60 class="{{ $tabClasses }}"> ··· 80 80 id="{{ $id }}" 81 81 name="{{ $name }}" 82 82 rows="{{ $rows }}" 83 - class="w-full resize-y dark:bg-gray-700 dark:text-white dark:border-gray-600" 83 + class="w-full resize-y dark:bg-gray-800 dark:text-white dark:border-gray-700" 84 84 placeholder="{{ $placeholder }}" 85 85 >{{ $value }}</textarea> 86 86 </div>
+7 -7
appview/pages/templates/repo/pulls/fragments/pullStepReview.html
··· 144 144 type="text" 145 145 name="{{ $titleName }}" 146 146 value="{{ $displayTitle }}" 147 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600" 147 + class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700" 148 148 placeholder="{{ $p.Title }}" 149 149 /> 150 150 </div> ··· 216 216 {{ if $p.SHA }} 217 217 <span class="flex items-center gap-1 text-gray-700 dark:text-gray-300 flex-shrink-0"> 218 218 <button type="button" 219 - class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" 219 + class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded text-gray-700 dark:text-gray-300" 220 220 title="Copy SHA" 221 221 onclick="event.preventDefault(); event.stopPropagation(); navigator.clipboard.writeText('{{ $p.SHA }}'); this.innerHTML=`{{ i "copy-check" "w-4 h-4" }}`; setTimeout(() => this.innerHTML=`{{ i "copy" "w-4 h-4" }}`, 1500)"> 222 222 {{ i "copy" "w-4 h-4" }} 223 223 </button> 224 224 <a href="/{{ $repoInfo.FullName }}/tree/{{ $p.SHA }}" 225 225 onclick="event.stopPropagation()" 226 - class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" 226 + class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded text-gray-700 dark:text-gray-300" 227 227 title="Browse repository at this commit"> 228 228 {{ i "folder-code" "w-4 h-4" }} 229 229 </a> ··· 254 254 <input type="checkbox" id="{{ $togId }}" class="hidden"/> 255 255 256 256 <div id="{{ $diffAreaId }}"> 257 - <div class="bg-slate-100 dark:bg-gray-900 flex items-center gap-2 h-12 p-2 rounded-t-md border border-b-0 border-gray-200 dark:border-gray-700"> 257 + <div class="bg-slate-100 dark:bg-gray-700/50 flex items-center gap-2 h-12 p-2 rounded-t-md border border-b-0 border-gray-200 dark:border-gray-700"> 258 258 <label title="Toggle filetree panel" for="{{ $togId }}" class="hidden md:inline-flex items-center justify-center rounded cursor-pointer text-normal font-normal normal-case"> 259 259 <span class="show-text">{{ i "panel-left-open" "size-4" }}</span> 260 260 <span class="hide-text">{{ i "panel-left-close" "size-4" }}</span> 261 261 </label> 262 262 263 263 {{ template "repo/fragments/diffStatPill" $stat }} 264 - <span class="text-xs text-gray-600 dark:text-gray-400 hidden md:inline-flex">{{ $count }} changed file{{ if ne $count 1 }}s{{ end }}</span> 264 + <span class="text-xs text-gray-600 dark:text-gray-300 hidden md:inline-flex">{{ $count }} changed file{{ if ne $count 1 }}s{{ end }}</span> 265 265 266 266 <div class="flex-grow"></div> 267 267 ··· 425 425 <input type="checkbox" id="composeFilesToggle" class="hidden"/> 426 426 427 427 <div id="diff-area"> 428 - <div class="bg-slate-100 dark:bg-gray-900 flex items-center gap-2 h-12 p-2 rounded-t-md border border-b-0 border-gray-200 dark:border-gray-700"> 428 + <div class="bg-slate-100 dark:bg-gray-700/50 flex items-center gap-2 h-12 p-2 rounded-t-md border border-b-0 border-gray-200 dark:border-gray-700"> 429 429 <label title="Toggle filetree panel" for="composeFilesToggle" class="hidden md:inline-flex items-center justify-center rounded cursor-pointer text-normal font-normal normal-case"> 430 430 <span class="show-text">{{ i "panel-left-open" "size-4" }}</span> 431 431 <span class="hide-text">{{ i "panel-left-close" "size-4" }}</span> 432 432 </label> 433 433 434 434 {{ template "repo/fragments/diffStatPill" $stat }} 435 - <span class="text-xs text-gray-600 dark:text-gray-400 hidden md:inline-flex">{{ $count }} changed file{{ if ne $count 1 }}s{{ end }}</span> 435 + <span class="text-xs text-gray-600 dark:text-gray-300 hidden md:inline-flex">{{ $count }} changed file{{ if ne $count 1 }}s{{ end }}</span> 436 436 437 437 <div class="flex-grow"></div> 438 438
+3 -3
appview/pages/templates/repo/pulls/fragments/pullStepSource.html
··· 94 94 {{ end }} 95 95 96 96 {{ define "pullSourceTabs" }} 97 - {{ $active := "bg-white dark:bg-gray-800 shadow-sm cursor-default" }} 97 + {{ $active := "bg-white dark:bg-gray-800 shadow-sm cursor-default border border-gray-700" }} 98 98 {{ $inactive := "bg-transparent hover:bg-white/50 dark:hover:bg-gray-800/50" }} 99 - {{ $shared := "group flex-1 p-3 text-left hover:no-underline flex flex-col gap-1 rounded border-0" }} 99 + {{ $shared := "group flex-1 p-3 text-left hover:no-underline flex flex-col gap-1 rounded" }} 100 100 {{ $titleCls := "font-medium text-sm dark:text-white flex items-center gap-2" }} 101 101 {{ $descCls := "text-xs text-gray-500 dark:text-gray-400" }} 102 102 {{ $fullName := .RepoInfo.FullName }} 103 - <div class="flex gap-1 p-1 rounded-md bg-slate-100 dark:bg-gray-900" 103 + <div class="flex gap-1 p-1.5 rounded-md bg-slate-100 dark:bg-gray-900 border dark:border-gray-700 items-center justify-stretch" 104 104 hx-on::before-request="const t=event.target.closest('button'); if(!t||t.classList.contains('shadow-sm'))return event.preventDefault();"> 105 105 {{ if .RepoInfo.Roles.IsPushAllowed }} 106 106 <button
+1 -1
appview/pages/templates/spindles/index.html
··· 76 76 name="instance" 77 77 placeholder="spindle.example.com" 78 78 required 79 - class="flex-1 w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-3 py-2 border rounded" 79 + class="flex-1 w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 dark:placeholder-gray-400 px-3 py-2 border rounded" 80 80 > 81 81 <button 82 82 type="submit"
+1 -1
appview/pages/templates/strings/fragments/form.html
··· 31 31 name="content" 32 32 id="content-textarea" 33 33 wrap="off" 34 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 font-mono" 34 + class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 dark:placeholder-gray-400 font-mono" 35 35 rows="20" 36 36 spellcheck="false" 37 37 placeholder="Paste your string here!"
+1 -1
appview/pages/templates/user/settings/emails.html
··· 72 72 name="email" 73 73 required 74 74 placeholder="your@email.com" 75 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400" 75 + class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 dark:placeholder-gray-400" 76 76 /> 77 77 <div class="flex gap-2 pt-2"> 78 78 <button
+2 -2
appview/pages/templates/user/settings/keys.html
··· 73 73 name="name" 74 74 required 75 75 placeholder="key name" 76 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400" 76 + class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 dark:placeholder-gray-400" 77 77 /> 78 78 <textarea 79 79 type="text" ··· 81 81 name="key" 82 82 required 83 83 placeholder="ssh-rsa AAAAB3NzaC1yc2E..." 84 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400"></textarea> 84 + class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 dark:placeholder-gray-400"></textarea> 85 85 <div class="flex gap-2 pt-2"> 86 86 <button 87 87 type="button"
+1 -1
appview/pages/templates/user/settings/profile.html
··· 80 80 <label class="uppercase text-sm font-bold p-0">Change handle</label> 81 81 <form hx-post="/settings/handle" hx-swap="none" class="flex flex-col gap-3"> 82 82 <input type="hidden" name="type" value="custom"> 83 - <input id="custom-domain-input" type="text" name="handle" placeholder="mycoolhandle.com" class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-2 py-1.5 border border-gray-200 dark:border-gray-600 rounded outline-none focus:ring-1 focus:ring-blue-500" required> 83 + <input id="custom-domain-input" type="text" name="handle" placeholder="mycoolhandle.com" class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 dark:placeholder-gray-400 px-2 py-1.5 border border-gray-200 dark:border-gray-600 rounded outline-none focus:ring-1 focus:ring-blue-500" required> 84 84 <div class="bg-gray-50 dark:bg-gray-900 rounded p-3 text-gray-500 dark:text-gray-400 flex flex-col gap-2 text-xs"> 85 85 <p>Set up one of the following on your domain:</p> 86 86 <div>

History

1 round 0 comments
sign up or login to add to the discussion
eti.tf submitted #0
1 commit
expand
appview/pulls/new: tweak border and background color of elements
merge conflicts detected
expand
  • appview/pages/templates/knots/index.html:79
  • appview/pages/templates/repo/fragments/diffOpts.html:12
  • appview/pages/templates/repo/new.html:111
  • appview/pages/templates/repo/pulls/fragments/pullPatchUpload.html:19
  • appview/pages/templates/repo/pulls/fragments/pullStepDetails.html:30
  • appview/pages/templates/repo/pulls/fragments/pullStepReview.html:144
  • appview/pages/templates/repo/pulls/fragments/pullStepSource.html:94
  • appview/pages/templates/spindles/index.html:76
  • appview/pages/templates/strings/fragments/form.html:31
  • appview/pages/templates/user/settings/emails.html:72
  • appview/pages/templates/user/settings/keys.html:73
  • appview/pages/templates/user/settings/profile.html:80
expand 0 comments