From 1535c1f8378f318ee4a9bf046eabde3039cfe241 Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Wed, 26 Mar 2025 19:54:41 +0000
Subject: [PATCH] small darkmode fixes

---
 appview/pages/templates/repo/pulls/pull.html  | 12 +++++++-----
 appview/pages/templates/repo/pulls/pulls.html |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index 3cfb0546..bda436bc 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -174,14 +174,16 @@
   {{ else if and .MergeCheck .MergeCheck.IsConflicted }}
     <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">
       <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>
-      <div class="flex items-center gap-2 text-red-500 dark:text-red-300">
-        {{ i "triangle-alert" "w-4 h-4" }}
-        <span class="font-medium">merge conflicts detected</span>
-        <ul class="text-sm space-y-1">
+      <div class="flex flex-col items-center gap-2 text-red-500 dark:text-red-300">
+        <div class="flex items-center gap-2">
+          {{ i "triangle-alert" "w-4 h-4" }}
+          <span class="font-medium">merge conflicts detected</span>
+        </div>
+        <ul class="space-y-1">
           {{ range .MergeCheck.Conflicts }}
             {{ if .Filename }}
             <li class="flex items-center">
-              {{ i "file-warning" "w-3 h-3 mr-1.5 text-red-500 dark:text-red-300" }}
+              {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }}
               <span class="font-mono">{{ slice .Filename 0 (sub (len .Filename) 2) }}</span>
             </li>
             {{ end }}
diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html
index 16b25bbc..e3cb44c1 100644
--- a/appview/pages/templates/repo/pulls/pulls.html
+++ b/appview/pages/templates/repo/pulls/pulls.html
@@ -5,7 +5,7 @@
         <p class="dark:text-white">
             filtering
             <select
-                class="border px-1 bg-white dark:bg-gray-700 border-gray-200 dark:border-gray-600 dark:text-white"
+                class="border px-1 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-600 dark:text-white"
                 onchange="window.location.href = '/{{ .RepoInfo.FullName }}/pulls?state=' + this.value"
             >
                 <option value="open" {{ if .FilteringBy.IsOpen }}selected{{ end }}>
-- 
2.51.2