From a9cd4ced6075eebbc4774df64a70d317c4a2eaae Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Tue, 1 Sep 2026 21:30:16 +0200
Subject: [PATCH] feat: match the search tab chrome to the mail page sidebar
 #641

---
 components/global-search/search-facets.tsx   | 43 ++++++++++++++------
 components/global-search/search-tab-body.tsx |  8 ++--
 locales/ar/common.json                       |  3 +-
 locales/ca/common.json                       |  3 +-
 locales/cs/common.json                       |  3 +-
 locales/da/common.json                       |  3 +-
 locales/de/common.json                       |  3 +-
 locales/en/common.json                       |  3 +-
 locales/es/common.json                       |  3 +-
 locales/fa/common.json                       |  3 +-
 locales/fr/common.json                       |  3 +-
 locales/he/common.json                       |  3 +-
 locales/hu/common.json                       |  3 +-
 locales/it/common.json                       |  3 +-
 locales/ja/common.json                       |  3 +-
 locales/ko/common.json                       |  3 +-
 locales/lv/common.json                       |  3 +-
 locales/mn/common.json                       |  3 +-
 locales/nb/common.json                       |  3 +-
 locales/nl/common.json                       |  3 +-
 locales/pl/common.json                       |  3 +-
 locales/pt/common.json                       |  3 +-
 locales/ro/common.json                       |  3 +-
 locales/ru/common.json                       |  3 +-
 locales/sk/common.json                       |  3 +-
 locales/tr/common.json                       |  3 +-
 locales/uk/common.json                       |  3 +-
 locales/zh-TW/common.json                    |  3 +-
 locales/zh/common.json                       |  3 +-
 29 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/components/global-search/search-facets.tsx b/components/global-search/search-facets.tsx
index a9ab2e9b5..bd82e9611 100644
--- a/components/global-search/search-facets.tsx
+++ b/components/global-search/search-facets.tsx
@@ -18,19 +18,38 @@ export interface SearchFacetsProps {
   onFlatChange: (flat: boolean) => void;
 }
 
+/** Section title, styled like the mail sidebar's section rows. */
+function FacetSection({ title, first, children }: { title: string; first?: boolean; children: React.ReactNode }) {
+  return (
+    <section>
+      <div className={cn("px-3 pb-1", first ? "pt-3" : "pt-5")}>
+        <span className="text-xs font-semibold text-muted-foreground truncate">{title}</span>
+      </div>
+      {children}
+    </section>
+  );
+}
+
+/** One facet row, styled like a mail sidebar folder row (start-border selection marker). */
 function FacetButton({ active, label, count, onClick }: { active: boolean; label: string; count?: string; onClick: () => void }) {
   return (
     <button
       type="button"
       onClick={onClick}
       aria-pressed={active}
+      style={{ paddingBlock: 'var(--density-sidebar-py)' }}
       className={cn(
-        "w-full flex items-center justify-between gap-2 px-2 py-1 rounded-md text-sm text-left cursor-pointer",
-        active ? "bg-primary/10 text-primary font-medium" : "text-muted-foreground hover:bg-muted hover:text-foreground",
+        "w-full flex items-center gap-2 ps-3 pe-2 text-sm text-left transition-colors duration-150 cursor-pointer",
+        "max-lg:min-h-[44px] border-s-2",
+        active
+          ? "bg-accent text-accent-foreground font-semibold border-primary"
+          : "hover:bg-muted/50 text-foreground border-transparent",
       )}
     >
-      <span className="truncate">{label}</span>
-      {count !== undefined && <span className="shrink-0 text-xs tabular-nums">{count}</span>}
+      <span className="flex-1 truncate">{label}</span>
+      {count !== undefined && (
+        <span className={cn("shrink-0 text-xs tabular-nums", active ? "font-semibold text-accent-foreground" : "text-muted-foreground")}>{count}</span>
+      )}
     </button>
   );
 }
@@ -45,9 +64,8 @@ export function SearchFacets({
   const total = SEARCH_KINDS.reduce((sum, kind) => sum + kindCounts[kind], 0);
   const anyMore = SEARCH_KINDS.some((kind) => kindHasMore[kind]);
   return (
-    <div className="flex flex-col gap-4 p-3 overflow-y-auto">
-      <section>
-        <h3 className="px-2 pb-1 text-xs font-medium text-muted-foreground uppercase tracking-wide">{t('scope_label')}</h3>
+    <div className="flex flex-col pb-3 overflow-y-auto">
+      <FacetSection title={t('scope_label')} first>
         <FacetButton
           active={scope === 'all'}
           label={t('scope_all')}
@@ -63,11 +81,10 @@ export function SearchFacets({
             onClick={() => onScopeChange(kind)}
           />
         ))}
-      </section>
+      </FacetSection>
 
       {accounts.length > 1 && (
-        <section>
-          <h3 className="px-2 pb-1 text-xs font-medium text-muted-foreground uppercase tracking-wide">{t('account_label')}</h3>
+        <FacetSection title={t('account_label')}>
           <FacetButton active={accountId === null} label={t('all_accounts')} onClick={() => onAccountChange(null)} />
           {accounts.map((account) => (
             <FacetButton
@@ -78,13 +95,13 @@ export function SearchFacets({
               onClick={() => onAccountChange(account.localAccountId)}
             />
           ))}
-        </section>
+        </FacetSection>
       )}
 
-      <section>
+      <FacetSection title={t('view_label')}>
         <FacetButton active={!flat} label={t('grouped')} onClick={() => onFlatChange(false)} />
         <FacetButton active={flat} label={t('flat_by_date')} onClick={() => onFlatChange(true)} />
-      </section>
+      </FacetSection>
     </div>
   );
 }
diff --git a/components/global-search/search-tab-body.tsx b/components/global-search/search-tab-body.tsx
index 7d0a60d7d..17c5d1dbe 100644
--- a/components/global-search/search-tab-body.tsx
+++ b/components/global-search/search-tab-body.tsx
@@ -90,8 +90,8 @@ export function SearchTabBody({ tabId, data }: SearchTabBodyProps) {
   const handleOpen = (hit: GlobalSearchHit) => { void openHit(hit, { proShell: true }); };
 
   return (
-    <div className="flex h-full min-h-0 w-full">
-      <aside className="w-48 shrink-0 border-r border-border overflow-y-auto">
+    <div className="flex h-full min-h-0 w-full bg-background">
+      <aside className="w-56 shrink-0 bg-secondary border-e border-border overflow-y-auto">
         <SearchFacets
           scope={data.scope}
           onScopeChange={setScope}
@@ -105,8 +105,8 @@ export function SearchTabBody({ tabId, data }: SearchTabBodyProps) {
         />
       </aside>
 
-      <section className="flex-1 min-w-0 flex flex-col border-r border-border">
-        <div className="flex items-center gap-2 px-3 py-2 border-b border-border">
+      <section className="flex-1 lg:flex-none lg:w-96 min-w-0 flex flex-col border-e border-border">
+        <div className="flex h-10 flex-shrink-0 items-center gap-2 border-b border-border px-3">
           <Search className="w-4 h-4 shrink-0 text-muted-foreground" />
           <input
             type="text"
diff --git a/locales/ar/common.json b/locales/ar/common.json
index b07f4f798..f3593c24c 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "مجمّع",
     "load_more": "تحميل المزيد",
     "preview_empty": "اختر نتيجة لمعاينتها",
-    "open_full": "فتح"
+    "open_full": "فتح",
+    "view_label": "العرض"
   }
 }
diff --git a/locales/ca/common.json b/locales/ca/common.json
index a5d6318b8..7d13365b6 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Agrupat",
     "load_more": "Carrega'n més",
     "preview_empty": "Seleccioneu un resultat per previsualitzar-lo",
-    "open_full": "Obre"
+    "open_full": "Obre",
+    "view_label": "Vista"
   }
 }
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 612070b3c..e6f64ff97 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Seskupené",
     "load_more": "Načíst další",
     "preview_empty": "Vyberte výsledek pro náhled",
-    "open_full": "Otevřít"
+    "open_full": "Otevřít",
+    "view_label": "Zobrazení"
   }
 }
diff --git a/locales/da/common.json b/locales/da/common.json
index 9bbd93191..aaf49e493 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Grupperet",
     "load_more": "Indlæs flere",
     "preview_empty": "Vælg et resultat for at se det",
-    "open_full": "Åbn"
+    "open_full": "Åbn",
+    "view_label": "Visning"
   }
 }
diff --git a/locales/de/common.json b/locales/de/common.json
index b24ae741a..c3f8bfc16 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Gruppiert",
     "load_more": "Mehr laden",
     "preview_empty": "Ergebnis auswählen, um es anzuzeigen",
-    "open_full": "Öffnen"
+    "open_full": "Öffnen",
+    "view_label": "Ansicht"
   }
 }
diff --git a/locales/en/common.json b/locales/en/common.json
index 8284f8244..e881579f8 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Grouped",
     "load_more": "Load more",
     "preview_empty": "Select a result to preview it",
-    "open_full": "Open"
+    "open_full": "Open",
+    "view_label": "View"
   }
 }
diff --git a/locales/es/common.json b/locales/es/common.json
index 391e8b032..1ce3a580b 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Agrupado",
     "load_more": "Cargar más",
     "preview_empty": "Selecciona un resultado para previsualizarlo",
-    "open_full": "Abrir"
+    "open_full": "Abrir",
+    "view_label": "Vista"
   }
 }
diff --git a/locales/fa/common.json b/locales/fa/common.json
index 8527595f8..9a03a9ac5 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "گروه‌بندی‌شده",
     "load_more": "بارگذاری بیشتر",
     "preview_empty": "برای پیش‌نمایش یک نتیجه انتخاب کنید",
-    "open_full": "باز کردن"
+    "open_full": "باز کردن",
+    "view_label": "نما"
   }
 }
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 4b93a37d6..3a50e0af0 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Groupé",
     "load_more": "Charger plus",
     "preview_empty": "Sélectionnez un résultat pour l'aperçu",
-    "open_full": "Ouvrir"
+    "open_full": "Ouvrir",
+    "view_label": "Affichage"
   }
 }
diff --git a/locales/he/common.json b/locales/he/common.json
index f459d8a35..61b8fdef0 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -3583,6 +3583,7 @@
     "grouped": "מקובץ",
     "load_more": "טען עוד",
     "preview_empty": "בחרו תוצאה לתצוגה מקדימה",
-    "open_full": "פתיחה"
+    "open_full": "פתיחה",
+    "view_label": "תצוגה"
   }
 }
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 3d1bf206e..f4e0b165c 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Csoportosított",
     "load_more": "Továbbiak betöltése",
     "preview_empty": "Válasszon egy találatot az előnézethez",
-    "open_full": "Megnyitás"
+    "open_full": "Megnyitás",
+    "view_label": "Nézet"
   }
 }
diff --git a/locales/it/common.json b/locales/it/common.json
index 7ee5f3145..76c846285 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Raggruppato",
     "load_more": "Carica altri",
     "preview_empty": "Seleziona un risultato per l'anteprima",
-    "open_full": "Apri"
+    "open_full": "Apri",
+    "view_label": "Vista"
   }
 }
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 481d50d8c..8c3b0df58 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "グループ表示",
     "load_more": "さらに読み込む",
     "preview_empty": "プレビューする結果を選択してください",
-    "open_full": "開く"
+    "open_full": "開く",
+    "view_label": "表示"
   }
 }
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 3644d578a..be83120b7 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "그룹 보기",
     "load_more": "더 불러오기",
     "preview_empty": "미리 볼 결과를 선택하세요",
-    "open_full": "열기"
+    "open_full": "열기",
+    "view_label": "보기"
   }
 }
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 5f537cd71..4c6dfe8b7 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Grupēts",
     "load_more": "Ielādēt vairāk",
     "preview_empty": "Izvēlieties rezultātu, lai to priekšskatītu",
-    "open_full": "Atvērt"
+    "open_full": "Atvērt",
+    "view_label": "Skats"
   }
 }
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 9b1e9ad66..c6373b383 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Бүлэглэсэн",
     "load_more": "Цааш ачаалах",
     "preview_empty": "Урьдчилан харах үр дүнгээ сонгоно уу",
-    "open_full": "Нээх"
+    "open_full": "Нээх",
+    "view_label": "Харагдац"
   }
 }
diff --git a/locales/nb/common.json b/locales/nb/common.json
index fb71ae585..9e34947bd 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Gruppert",
     "load_more": "Last inn flere",
     "preview_empty": "Velg et resultat for å forhåndsvise det",
-    "open_full": "Åpne"
+    "open_full": "Åpne",
+    "view_label": "Visning"
   }
 }
diff --git a/locales/nl/common.json b/locales/nl/common.json
index d931a6b61..92b56b04c 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Gegroepeerd",
     "load_more": "Meer laden",
     "preview_empty": "Selecteer een resultaat voor een voorbeeld",
-    "open_full": "Openen"
+    "open_full": "Openen",
+    "view_label": "Weergave"
   }
 }
diff --git a/locales/pl/common.json b/locales/pl/common.json
index fff2f0210..c3d111f5e 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Pogrupowane",
     "load_more": "Wczytaj więcej",
     "preview_empty": "Wybierz wynik, aby zobaczyć podgląd",
-    "open_full": "Otwórz"
+    "open_full": "Otwórz",
+    "view_label": "Widok"
   }
 }
diff --git a/locales/pt/common.json b/locales/pt/common.json
index cadee83c2..58eb61998 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Agrupado",
     "load_more": "Carregar mais",
     "preview_empty": "Selecione um resultado para pré-visualizar",
-    "open_full": "Abrir"
+    "open_full": "Abrir",
+    "view_label": "Vista"
   }
 }
diff --git a/locales/ro/common.json b/locales/ro/common.json
index bfe279d6a..8ccca6843 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Grupat",
     "load_more": "Încarcă mai multe",
     "preview_empty": "Selectează un rezultat pentru previzualizare",
-    "open_full": "Deschide"
+    "open_full": "Deschide",
+    "view_label": "Vizualizare"
   }
 }
diff --git a/locales/ru/common.json b/locales/ru/common.json
index e6b6e5a05..4bcac6cb2 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "По группам",
     "load_more": "Загрузить ещё",
     "preview_empty": "Выберите результат для предпросмотра",
-    "open_full": "Открыть"
+    "open_full": "Открыть",
+    "view_label": "Вид"
   }
 }
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 506fffaf3..62be45f2a 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Zoskupené",
     "load_more": "Načítať ďalšie",
     "preview_empty": "Vyberte výsledok pre náhľad",
-    "open_full": "Otvoriť"
+    "open_full": "Otvoriť",
+    "view_label": "Zobrazenie"
   }
 }
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 69cf04d38..c8967faee 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "Gruplandırılmış",
     "load_more": "Daha fazla yükle",
     "preview_empty": "Önizlemek için bir sonuç seçin",
-    "open_full": "Aç"
+    "open_full": "Aç",
+    "view_label": "Görünüm"
   }
 }
diff --git a/locales/uk/common.json b/locales/uk/common.json
index b8701f2ac..4b239485b 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "За групами",
     "load_more": "Завантажити ще",
     "preview_empty": "Виберіть результат для перегляду",
-    "open_full": "Відкрити"
+    "open_full": "Відкрити",
+    "view_label": "Вигляд"
   }
 }
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 65d458179..4720d753a 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -3577,6 +3577,7 @@
     "grouped": "分組",
     "load_more": "載入更多",
     "preview_empty": "選擇結果以預覽",
-    "open_full": "開啟"
+    "open_full": "開啟",
+    "view_label": "檢視"
   }
 }
diff --git a/locales/zh/common.json b/locales/zh/common.json
index e77910547..67a61d033 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -3582,6 +3582,7 @@
     "grouped": "分组",
     "load_more": "加载更多",
     "preview_empty": "选择一个结果以预览",
-    "open_full": "打开"
+    "open_full": "打开",
+    "view_label": "视图"
   }
 }