+7 -5

appview/pages/templates/repo/pulls/pull.html

Reviewed

··· 174 174 {{ else if and .MergeCheck .MergeCheck.IsConflicted }} 175 175 <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 176 176 <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 177 177 - <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 178 178 - {{ i "triangle-alert" "w-4 h-4" }} 179 179 - <span class="font-medium">merge conflicts detected</span> 180 180 - <ul class="text-sm space-y-1"> 177 177 + <div class="flex flex-col items-center gap-2 text-red-500 dark:text-red-300"> 178 178 + <div class="flex items-center gap-2"> 179 179 + {{ i "triangle-alert" "w-4 h-4" }} 180 180 + <span class="font-medium">merge conflicts detected</span> 181 181 + </div> 182 182 + <ul class="space-y-1"> 181 183 {{ range .MergeCheck.Conflicts }} 182 184 {{ if .Filename }} 183 185 <li class="flex items-center"> 184 184 - {{ i "file-warning" "w-3 h-3 mr-1.5 text-red-500 dark:text-red-300" }} 186 186 + {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 185 187 <span class="font-mono">{{ slice .Filename 0 (sub (len .Filename) 2) }}</span> 186 188 </li> 187 189 {{ end }}

+1 -1

appview/pages/templates/repo/pulls/pulls.html

Reviewed

··· 5 5 <p class="dark:text-white"> 6 6 filtering 7 7 <select 8 8 - class="border px-1 bg-white dark:bg-gray-700 border-gray-200 dark:border-gray-600 dark:text-white" 8 8 + class="border px-1 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-600 dark:text-white" 9 9 onchange="window.location.href = '/{{ .RepoInfo.FullName }}/pulls?state=' + this.value" 10 10 > 11 11 <option value="open" {{ if .FilteringBy.IsOpen }}selected{{ end }}>