Skip to content

Commit c8fa261

Browse files
committed
DIGG-465: Fixing layout on content search
1 parent fba456d commit c8fa261

File tree

1 file changed

+52
-48
lines changed
  • components/content/Search/SearchPage/SearchContentPage

1 file changed

+52
-48
lines changed

components/content/Search/SearchPage/SearchContentPage/index.tsx

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -200,58 +200,62 @@ export const SearchContentPage: FC<SearchProps> = () => {
200200
</form>
201201

202202
<SearchPageSelector query={query} />
203+
</Container>
203204

204-
<div id="search-result" className="my-lg md:my-xl">
205-
<div className="mb-lg md:mb-xl">
206-
<Heading level={2} size="md">
207-
{loading && <span>{t("common|loading")}</span>}
208-
{!loading &&
209-
searchResult &&
210-
(searchResult.count || 0) >= 0 &&
211-
`${searchResult.count} ${t("pages|search$content-hits")}`}
212-
</Heading>
213-
</div>
205+
<div className="bg-white">
206+
<Container>
207+
<div id="search-result" className="my-lg py-xl md:my-xl">
208+
<div className="mb-lg md:mb-xl">
209+
<Heading level={2} size="md">
210+
{loading && <span>{t("common|loading")}</span>}
211+
{!loading &&
212+
searchResult &&
213+
(searchResult.count || 0) >= 0 &&
214+
`${searchResult.count} ${t("pages|search$content-hits")}`}
215+
</Heading>
216+
</div>
214217

215-
{searchResult && (
216-
<ul className="search-result-list space-y-lg md:space-y-xl">
217-
{searchResult.hits &&
218-
searchResult.hits.map((hit: SearchHit, index: number) => (
219-
<li className="group relative max-w-lg" key={index}>
220-
<Link
221-
href={`${cleanDoubleSlash(hit.url!)}#ref=${
222-
window ? window.location.search : ""
223-
}`}
224-
onClick={() => {
225-
saveCurrentScrollPos();
226-
}}
227-
className="before:focus--outline before:focus--out before:focus--primary focus--none no-underline before:absolute before:inset-none"
228-
>
229-
<Heading
230-
level={3}
231-
size="sm"
232-
className={`mb-sm font-normal text-green-600 group-focus-within:underline group-hover:underline`}
233-
lang={hit.titleLang}
218+
{searchResult && (
219+
<ul className="search-result-list space-y-lg md:space-y-xl">
220+
{searchResult.hits &&
221+
searchResult.hits.map((hit: SearchHit, index: number) => (
222+
<li className="group relative max-w-lg" key={index}>
223+
<Link
224+
href={`${cleanDoubleSlash(hit.url!)}#ref=${
225+
window ? window.location.search : ""
226+
}`}
227+
onClick={() => {
228+
saveCurrentScrollPos();
229+
}}
230+
className="before:focus--outline before:focus--out before:focus--primary focus--none no-underline before:absolute before:inset-none"
234231
>
235-
{highlightWords(hit.title)}
236-
</Heading>
237-
</Link>
238-
{hit.description && (
239-
<p>{highlightWords(hit.description)}</p>
240-
)}
241-
</li>
242-
))}
243-
</ul>
232+
<Heading
233+
level={3}
234+
size="sm"
235+
className={`mb-sm font-normal text-green-600 group-focus-within:underline group-hover:underline`}
236+
lang={hit.titleLang}
237+
>
238+
{highlightWords(hit.title)}
239+
</Heading>
240+
</Link>
241+
{hit.description && (
242+
<p>{highlightWords(hit.description)}</p>
243+
)}
244+
</li>
245+
))}
246+
</ul>
247+
)}
248+
</div>
249+
{searchResult?.hits && (
250+
<Pagination
251+
totalResults={searchResult?.count || 0}
252+
itemsPerPage={PER_PAGE}
253+
pageNumber={pageNumber}
254+
changePage={changePage}
255+
/>
244256
)}
245-
</div>
246-
{searchResult?.hits && (
247-
<Pagination
248-
totalResults={searchResult?.count || 0}
249-
itemsPerPage={PER_PAGE}
250-
pageNumber={pageNumber}
251-
changePage={changePage}
252-
/>
253-
)}
254-
</Container>
257+
</Container>
258+
</div>
255259
</div>
256260
);
257261
};

0 commit comments

Comments
 (0)