Merge remote-tracking branch 'origin/main' into assistant-2

styles/src/styleTree/editor.ts

@@ -112,7 +112,7 @@ export default function editor(colorScheme: ColorScheme) {
             widthEm: 0.15,
             cornerRadius: 0.05,
         },
-        /** Highlights matching occurences of what is under the cursor
+        /** Highlights matching occurrences of what is under the cursor
          * as well as matched brackets
          */
         documentHighlightReadBackground: withOpacity(

styles/src/styleTree/projectPanel.ts

@@ -8,10 +8,10 @@ export default function projectPanel(colorScheme: ColorScheme) {
     let layer = colorScheme.middle
 
     let baseEntry = {
-        height: 24,
+        height: 22,
         iconColor: foreground(layer, "variant"),
-        iconSize: 8,
-        iconSpacing: 8,
+        iconSize: 7,
+        iconSpacing: 5,
     }
 
     let status = {
@@ -71,8 +71,8 @@ export default function projectPanel(colorScheme: ColorScheme) {
             },
         },
         background: background(layer),
-        padding: { left: 12, right: 12, top: 6, bottom: 6 },
-        indentWidth: 8,
+        padding: { left: 6, right: 6, top: 0, bottom: 6 },
+        indentWidth: 12,
         entry,
         draggedEntry: {
             ...baseEntry,
@@ -83,7 +83,12 @@ export default function projectPanel(colorScheme: ColorScheme) {
         },
         ignoredEntry: {
             ...entry,
+            iconColor: foreground(layer, "disabled"),
             text: text(layer, "mono", "disabled"),
+            active: {
+                ...entry.active,
+                iconColor: foreground(layer, "variant"),
+            }
         },
         cutEntry: {
             ...entry,

styles/src/styleTree/search.ts

@@ -33,7 +33,7 @@ export default function search(colorScheme: ColorScheme) {
     };
 
     return {
-        // TODO: Add an activeMatchBackground on the rust side to differenciate between active and inactive
+        // TODO: Add an activeMatchBackground on the rust side to differentiate between active and inactive
         matchBackground: withOpacity(foreground(layer, "accent"), 0.4),
         optionButton: {
             ...text(layer, "mono", "on"),