From e0a5e37fb7e3dbe1f23e555d598bd148bd00f16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= <rudolfs@osins.org>
Date: Wed, 29 Nov 2023 16:57:55 +0100
Subject: [PATCH] Tweak dropdown list selected item colors

---
 src/components/DropdownList/DropdownListItem.svelte | 2 +-
 src/views/projects/Issues.svelte                    | 5 +----
 src/views/projects/Patch.svelte                     | 7 ++-----
 src/views/projects/Patches.svelte                   | 5 +----
 src/views/projects/Source/BranchSelector.svelte     | 6 +++---
 src/views/projects/Source/PeerSelector.svelte       | 6 +-----
 6 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/components/DropdownList/DropdownListItem.svelte b/src/components/DropdownList/DropdownListItem.svelte
index 2b155bdad..8153f5906 100644
--- a/src/components/DropdownList/DropdownListItem.svelte
+++ b/src/components/DropdownList/DropdownListItem.svelte
@@ -27,7 +27,7 @@
     background-color: var(--color-fill-ghost);
   }
   .selected {
-    color: var(--color-fill-secondary);
+    color: var(--color-foreground-contrast);
     background-color: var(--color-fill-ghost);
   }
   .item:hover.selected {
diff --git a/src/views/projects/Issues.svelte b/src/views/projects/Issues.svelte
index a9e95afbd..28cee444f 100644
--- a/src/views/projects/Issues.svelte
+++ b/src/views/projects/Issues.svelte
@@ -114,10 +114,7 @@
                 state: item,
               }}>
               <DropdownListItem selected={item === state}>
-                <div
-                  style:color={item === state
-                    ? "var(--color-fill-secondary)"
-                    : stateColor[item]}>
+                <div style:color={stateColor[item]}>
                   <Icon name="issue" />
                 </div>
                 {project.issues[item]}
diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte
index 156a3c0e9..60ef4ea52 100644
--- a/src/views/projects/Patch.svelte
+++ b/src/views/projects/Patch.svelte
@@ -783,9 +783,7 @@
                   on:click={toggle}
                   size="regular"
                   disabled={patch.revisions.length === 1}>
-                  <span
-                    style:font-weight="var(--font-weight-regular)"
-                    style:color="var(--color-fill-gray)">
+                  <span style:color="var(--color-foreground-contrast)">
                     Revision
                   </span>
                   <span
@@ -811,9 +809,8 @@
                       }}>
                       <DropdownListItem selected={item.id === view.revision}>
                         <span
-                          style:font-weight="var(--font-weight-regular)"
                           style:color={item.id === view.revision
-                            ? "var(--color-fill-secondary)"
+                            ? "var(--color-foreground-contrast)"
                             : "var(--color-fill-gray)"}>
                           Revision
                         </span>
diff --git a/src/views/projects/Patches.svelte b/src/views/projects/Patches.svelte
index 5a90a5a49..da76808af 100644
--- a/src/views/projects/Patches.svelte
+++ b/src/views/projects/Patches.svelte
@@ -118,10 +118,7 @@
                 search: `state=${item}`,
               }}>
               <DropdownListItem selected={item === state}>
-                <div
-                  style:color={item === state
-                    ? "var(--color-fill-secondary)"
-                    : stateColor[item]}>
+                <div style:color={stateColor[item]}>
                   <Icon name="patch" />
                 </div>
                 {project.patches[item]}
diff --git a/src/views/projects/Source/BranchSelector.svelte b/src/views/projects/Source/BranchSelector.svelte
index 441699c23..3c1dee1fe 100644
--- a/src/views/projects/Source/BranchSelector.svelte
+++ b/src/views/projects/Source/BranchSelector.svelte
@@ -44,7 +44,7 @@
         stylePopoverPositionTop="0.5rem">
         <Button
           ariaLabel="canonical-branch"
-          variant="outline"
+          variant="gray-white"
           styleBorderRadius="var(--border-radius-tiny) 0 0 var(--border-radius-tiny)"
           slot="toggle"
           disabled
@@ -66,7 +66,7 @@
         popoverPositionTop="2.5rem"
         popoverBorderRadius="var(--border-radius-small)">
         <Button
-          variant="outline"
+          variant="gray-white"
           let:expanded
           let:toggle
           on:click={toggle}
@@ -98,7 +98,7 @@
 
   <Button
     title="Current HEAD"
-    variant={selectedBranch ? "gray" : "outline"}
+    variant="dim"
     styleBorderRadius={selectedBranch
       ? "0 var(--border-radius-tiny) var(--border-radius-tiny) 0"
       : "var(--border-radius-tiny)"}>
diff --git a/src/views/projects/Source/PeerSelector.svelte b/src/views/projects/Source/PeerSelector.svelte
index 6d5044419..d5c6ce07d 100644
--- a/src/views/projects/Source/PeerSelector.svelte
+++ b/src/views/projects/Source/PeerSelector.svelte
@@ -66,11 +66,7 @@
             alias={item.remote.alias} />
           {#if item.remote.delegate}
             <div style:color="var(--color-fill-secondary)">
-              <Badge
-                size="tiny"
-                variant={item.selected ? "background" : "secondary"}>
-                delegate
-              </Badge>
+              <Badge size="tiny" variant="secondary">delegate</Badge>
             </div>
           {/if}
         </DropdownListItem>