forked from
tangled.org/core
this repo has no description
fix merge-conflict styles
+1
-1
+1
-1
appview/pages/templates/repo/pulls/pull.html
+1
-1
appview/pages/templates/repo/pulls/pull.html
···
183
183
{{ else if and .MergeCheck .MergeCheck.IsConflicted }}
184
184
<div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">
185
185
<div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>
186
-
<div class="flex flex-col items-center gap-2 text-red-500 dark:text-red-300">
186
+
<div class="flex flex-col gap-2 text-red-500 dark:text-red-300">
187
187
<div class="flex items-center gap-2">
188
188
{{ i "triangle-alert" "w-4 h-4" }}
189
189
<span class="font-medium">merge conflicts detected</span>