From 2b7cc8ca58428b7fc50db75742e4bd0e042e238e Mon Sep 17 00:00:00 2001 From: alice Date: Sun, 24 May 2026 14:39:28 +0000 Subject: [PATCH] Restore search page header --- src/locales/ar-SA.po | 1 + src/locales/ca-ES.po | 1 + src/locales/cs-CZ.po | 1 + src/locales/de-DE.po | 1 + src/locales/en.po | 1 + src/locales/eo-UY.po | 1 + src/locales/es-ES.po | 1 + src/locales/eu-ES.po | 1 + src/locales/fa-IR.po | 1 + src/locales/fi-FI.po | 1 + src/locales/fr-FR.po | 1 + src/locales/gl-ES.po | 1 + src/locales/he-IL.po | 1 + src/locales/it-IT.po | 1 + src/locales/ja-JP.po | 1 + src/locales/kab.po | 1 + src/locales/ko-KR.po | 1 + src/locales/lt-LT.po | 1 + src/locales/nb-NO.po | 1 + src/locales/nl-NL.po | 1 + src/locales/oc-FR.po | 1 + src/locales/pl-PL.po | 1 + src/locales/pseudo-LOCALE.po | 1 + src/locales/pt-BR.po | 1 + src/locales/pt-PT.po | 1 + src/locales/ru-RU.po | 1 + src/locales/th-TH.po | 1 + src/locales/tok.po | 1 + src/locales/tr-TR.po | 1 + src/locales/uk-UA.po | 1 + src/locales/zh-CN.po | 1 + src/locales/zh-TW.po | 1 + src/pages/search.css | 39 +++++++++++++++-------------------- src/pages/search.tsx | 20 +++++++++++++++++- tests/logged-out-view.spec.js | 8 ++++++- 35 files changed, 75 insertions(+), 24 deletions(-) diff --git a/src/locales/ar-SA.po b/src/locales/ar-SA.po index fc932486..4434844c 100644 --- a/src/locales/ar-SA.po +++ b/src/locales/ar-SA.po @@ -2347,6 +2347,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "الرئيسي" diff --git a/src/locales/ca-ES.po b/src/locales/ca-ES.po index bdc7096c..97aab77c 100644 --- a/src/locales/ca-ES.po +++ b/src/locales/ca-ES.po @@ -2369,6 +2369,7 @@ msgstr "Afegeix a les dreceres" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Inici" diff --git a/src/locales/cs-CZ.po b/src/locales/cs-CZ.po index d5a523c3..eccee6d4 100644 --- a/src/locales/cs-CZ.po +++ b/src/locales/cs-CZ.po @@ -2367,6 +2367,7 @@ msgstr "Přidat do zkratek" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Domovská stránka" diff --git a/src/locales/de-DE.po b/src/locales/de-DE.po index aac7e106..b2cbf067 100644 --- a/src/locales/de-DE.po +++ b/src/locales/de-DE.po @@ -2367,6 +2367,7 @@ msgstr "Zu Verknüpfungen hinzufügen" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Startseite" diff --git a/src/locales/en.po b/src/locales/en.po index a1382c4b..037d6da7 100644 --- a/src/locales/en.po +++ b/src/locales/en.po @@ -2013,6 +2013,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "" diff --git a/src/locales/eo-UY.po b/src/locales/eo-UY.po index ae5cc9e6..bbcdc309 100644 --- a/src/locales/eo-UY.po +++ b/src/locales/eo-UY.po @@ -2367,6 +2367,7 @@ msgstr "Aldoni al ŝparvojoj" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Hejmo" diff --git a/src/locales/es-ES.po b/src/locales/es-ES.po index 0f5c9b96..cfe6b221 100644 --- a/src/locales/es-ES.po +++ b/src/locales/es-ES.po @@ -2367,6 +2367,7 @@ msgstr "Añadir a atajos" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Inicio" diff --git a/src/locales/eu-ES.po b/src/locales/eu-ES.po index 1faaca47..dbfe0210 100644 --- a/src/locales/eu-ES.po +++ b/src/locales/eu-ES.po @@ -2367,6 +2367,7 @@ msgstr "Gehitu lasterbideetara" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Hasiera" diff --git a/src/locales/fa-IR.po b/src/locales/fa-IR.po index d9795c48..7a1045df 100644 --- a/src/locales/fa-IR.po +++ b/src/locales/fa-IR.po @@ -2367,6 +2367,7 @@ msgstr "افزودن به میانبرها" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "خانه" diff --git a/src/locales/fi-FI.po b/src/locales/fi-FI.po index 314fc0b0..53116014 100644 --- a/src/locales/fi-FI.po +++ b/src/locales/fi-FI.po @@ -2367,6 +2367,7 @@ msgstr "Lisää pikavalintoihin" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Koti" diff --git a/src/locales/fr-FR.po b/src/locales/fr-FR.po index 9673b7a3..8510d37b 100644 --- a/src/locales/fr-FR.po +++ b/src/locales/fr-FR.po @@ -2367,6 +2367,7 @@ msgstr "Ajouter aux raccourcis" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Accueil" diff --git a/src/locales/gl-ES.po b/src/locales/gl-ES.po index e567f292..579d8ea7 100644 --- a/src/locales/gl-ES.po +++ b/src/locales/gl-ES.po @@ -2369,6 +2369,7 @@ msgstr "Engadir a Atallos" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Inicio" diff --git a/src/locales/he-IL.po b/src/locales/he-IL.po index 4b0315bc..398364d5 100644 --- a/src/locales/he-IL.po +++ b/src/locales/he-IL.po @@ -2347,6 +2347,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "בית" diff --git a/src/locales/it-IT.po b/src/locales/it-IT.po index de9f1a7a..ecae7914 100644 --- a/src/locales/it-IT.po +++ b/src/locales/it-IT.po @@ -2367,6 +2367,7 @@ msgstr "Aggiungi a Scorciatoie" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Home" diff --git a/src/locales/ja-JP.po b/src/locales/ja-JP.po index 9168b167..3ecf0ef3 100644 --- a/src/locales/ja-JP.po +++ b/src/locales/ja-JP.po @@ -2367,6 +2367,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "ホーム" diff --git a/src/locales/kab.po b/src/locales/kab.po index d167009a..498be367 100644 --- a/src/locales/kab.po +++ b/src/locales/kab.po @@ -2367,6 +2367,7 @@ msgstr "Rnu ɣer inezgumen" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Agejdan" diff --git a/src/locales/ko-KR.po b/src/locales/ko-KR.po index fb0e9544..9dcb7498 100644 --- a/src/locales/ko-KR.po +++ b/src/locales/ko-KR.po @@ -2367,6 +2367,7 @@ msgstr "바로 가기 추가" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "홈" diff --git a/src/locales/lt-LT.po b/src/locales/lt-LT.po index ec3296d4..be023253 100644 --- a/src/locales/lt-LT.po +++ b/src/locales/lt-LT.po @@ -2367,6 +2367,7 @@ msgstr "Pridėti prie trumpųjų nuorodų" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Pagrindinis" diff --git a/src/locales/nb-NO.po b/src/locales/nb-NO.po index 8175c589..c10550b0 100644 --- a/src/locales/nb-NO.po +++ b/src/locales/nb-NO.po @@ -2347,6 +2347,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Hjem" diff --git a/src/locales/nl-NL.po b/src/locales/nl-NL.po index 96dfa21d..f2e942f1 100644 --- a/src/locales/nl-NL.po +++ b/src/locales/nl-NL.po @@ -2367,6 +2367,7 @@ msgstr "Voeg aan Snelkoppelingen toe" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Startpagina" diff --git a/src/locales/oc-FR.po b/src/locales/oc-FR.po index ced507e2..ad12260c 100644 --- a/src/locales/oc-FR.po +++ b/src/locales/oc-FR.po @@ -2347,6 +2347,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "" diff --git a/src/locales/pl-PL.po b/src/locales/pl-PL.po index 6545e062..322416bd 100644 --- a/src/locales/pl-PL.po +++ b/src/locales/pl-PL.po @@ -2367,6 +2367,7 @@ msgstr "Dodaj do skrótów" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Strona główna" diff --git a/src/locales/pseudo-LOCALE.po b/src/locales/pseudo-LOCALE.po index 70394a1f..d248c36c 100644 --- a/src/locales/pseudo-LOCALE.po +++ b/src/locales/pseudo-LOCALE.po @@ -2236,6 +2236,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "" diff --git a/src/locales/pt-BR.po b/src/locales/pt-BR.po index 1e677965..28ca7097 100644 --- a/src/locales/pt-BR.po +++ b/src/locales/pt-BR.po @@ -2367,6 +2367,7 @@ msgstr "Adicionar aos atalhos" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Início" diff --git a/src/locales/pt-PT.po b/src/locales/pt-PT.po index 84b03666..90f28239 100644 --- a/src/locales/pt-PT.po +++ b/src/locales/pt-PT.po @@ -2367,6 +2367,7 @@ msgstr "Adicionar aos atalhos" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Página inicial" diff --git a/src/locales/ru-RU.po b/src/locales/ru-RU.po index e7d83fc9..1de5584b 100644 --- a/src/locales/ru-RU.po +++ b/src/locales/ru-RU.po @@ -2367,6 +2367,7 @@ msgstr "Добавить в ярлыки" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Домашняя" diff --git a/src/locales/th-TH.po b/src/locales/th-TH.po index 391fde53..081142e1 100644 --- a/src/locales/th-TH.po +++ b/src/locales/th-TH.po @@ -2347,6 +2347,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "หน้าหลัก" diff --git a/src/locales/tok.po b/src/locales/tok.po index de87cae8..b4651b72 100644 --- a/src/locales/tok.po +++ b/src/locales/tok.po @@ -2347,6 +2347,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "" diff --git a/src/locales/tr-TR.po b/src/locales/tr-TR.po index 4fc84419..90bd618e 100644 --- a/src/locales/tr-TR.po +++ b/src/locales/tr-TR.po @@ -2347,6 +2347,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Ana Sayfa" diff --git a/src/locales/uk-UA.po b/src/locales/uk-UA.po index ca36ee27..d7a9680e 100644 --- a/src/locales/uk-UA.po +++ b/src/locales/uk-UA.po @@ -2367,6 +2367,7 @@ msgstr "Додати в Ярлики" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "Домашня" diff --git a/src/locales/zh-CN.po b/src/locales/zh-CN.po index 80f2eee8..8b4da145 100644 --- a/src/locales/zh-CN.po +++ b/src/locales/zh-CN.po @@ -2367,6 +2367,7 @@ msgstr "添加到快捷方式" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "主页" diff --git a/src/locales/zh-TW.po b/src/locales/zh-TW.po index 910b1a6d..7e08de5d 100644 --- a/src/locales/zh-TW.po +++ b/src/locales/zh-TW.po @@ -2347,6 +2347,7 @@ msgstr "" #: src/pages/catchup.tsx #: src/pages/home.tsx #: src/pages/notifications.tsx +#: src/pages/search.tsx msgid "Home" msgstr "主頁" diff --git a/src/pages/search.css b/src/pages/search.css index e77a5bf2..a4954b64 100644 --- a/src/pages/search.css +++ b/src/pages/search.css @@ -1,7 +1,3 @@ -#search-page .deck > header .header-grid { - grid-template-columns: auto 1fr auto; -} - #search-page ~ #compose-button { display: none; } @@ -11,7 +7,17 @@ transform: none; } -#search-page header { +#search-page #search-posts-page > .deck > header { + display: none; +} + +#search-page .search-input-dock { + display: grid; + grid-template-columns: 1fr auto; + gap: 8px; + align-items: center; + padding: 8px; + input { width: 100%; padding: 8px 16px; @@ -53,18 +59,12 @@ } #search-page { - > .deck > header { + .search-input-dock { position: fixed; - top: auto; bottom: var(--mobile-search-bottom); inset-inline: 0; z-index: 120; - transform: none; padding-inline: 8px; - pointer-events: none; - } - - > .deck > header .header-grid { grid-template-columns: 1fr auto; width: min(var(--main-width), calc(100vw - 16px)); margin-inline: auto; @@ -72,15 +72,6 @@ border-radius: 999px; overflow: visible; box-shadow: 0 10px 36px -4px var(--drop-shadow-color); - pointer-events: auto; - } - - > .deck > header .header-grid > .header-side:first-child { - display: none; - } - - > .deck > header .header-grid > .header-side:last-child { - grid-column: auto; } .search-popover { @@ -199,10 +190,14 @@ ul.link-list.hashtag-list li a { @media (min-width: 40em) { #search-page { - header input { + .search-input-dock input { background-color: var(--bg-color); } + .search-input-dock { + border-bottom: var(--hairline-width) solid var(--outline-color); + } + .filter-bar { margin-top: 8px; } diff --git a/src/pages/search.tsx b/src/pages/search.tsx index 100b5bea..b407e9df 100644 --- a/src/pages/search.tsx +++ b/src/pages/search.tsx @@ -539,8 +539,13 @@ function Search({ columnMode, ...props }: SearchProps) {
+ + +
- +

+ Search +

+
+ + +
{useNestedFilterBar ? null : filterBar} {q ? ( diff --git a/tests/logged-out-view.spec.js b/tests/logged-out-view.spec.js index 95ebdb8b..3c11bc23 100644 --- a/tests/logged-out-view.spec.js +++ b/tests/logged-out-view.spec.js @@ -1862,6 +1862,12 @@ test('keeps mobile search controls at the bottom and resets post results scroll' }); await expect(page.getByText('Alpha first search result')).toBeVisible(); await expect(page.locator('#compose-button')).toBeHidden(); + await expect( + page.locator('#search-page > .timeline-deck > header').getByRole('heading'), + ).toHaveText('Search'); + await expect( + page.locator('#search-page > .timeline-deck > header').getByLabel('Home'), + ).toBeVisible(); const controlsGeometry = await page.evaluate(() => { const input = document.querySelector('#search-page input[type="search"]'); @@ -1946,7 +1952,7 @@ test('keeps mobile search controls at the bottom and resets post results scroll' element.dispatchEvent(new Event('scroll', { bubbles: true })); }); await page.locator('#search-page input[type="search"]').fill('beta'); - await page.locator('#search-page header form').evaluate((form) => { + await page.locator('#search-page .search-input-dock form').evaluate((form) => { if (form instanceof HTMLFormElement) form.requestSubmit(); }); -- 2.51.2