Merge branch 'search-tabs' into 'develop'
Tabbed, paginated search results See merge request soapbox-pub/soapbox-fe!652
This commit is contained in:
commit
e7813e178a
10 changed files with 18 additions and 4 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
app/soapbox/features/search/components/filter_bar.js
Normal file
BIN
app/soapbox/features/search/components/filter_bar.js
Normal file
Binary file not shown.
Binary file not shown.
|
@ -636,6 +636,7 @@
|
|||
"search_results.statuses": "Wpisy",
|
||||
"search_results.top": "Góra",
|
||||
"search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
|
||||
"search_results.total.has_more": "{count, number} Ponad {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
|
||||
"security.codes.fail": "Nie udało się uzyskać zapasowych kodów",
|
||||
"security.confirm.fail": "Nieprawidłowy kod lub hasło. Spróbuj ponownie.",
|
||||
"security.delete_account.fail": "Nie udało się usunąć konta.",
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,9 +1,19 @@
|
|||
.search-page {
|
||||
min-height: 97px;
|
||||
}
|
||||
|
||||
@media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {
|
||||
.search-page .search {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 600px + (285px * 1) + (10px * 1) - 1px) {
|
||||
.search-page .column-header__wrapper {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.search {
|
||||
position: relative;
|
||||
}
|
||||
|
@ -68,8 +78,6 @@
|
|||
}
|
||||
|
||||
.search-results__section {
|
||||
margin-bottom: 5px;
|
||||
|
||||
h5 {
|
||||
background: var(--accent-color--faint);
|
||||
border-bottom: 1px solid var(--brand-color--faint);
|
||||
|
@ -86,8 +94,8 @@
|
|||
}
|
||||
}
|
||||
|
||||
.account:last-child,
|
||||
& > div:last-child .status {
|
||||
&:not(.has-more) .account:last-child,
|
||||
&:not(.has-more) > div:last-child .status {
|
||||
border-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
@ -160,3 +168,7 @@
|
|||
.search-popout {
|
||||
@include search-popout;
|
||||
}
|
||||
|
||||
.search__filter-bar:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
|
|
@ -608,6 +608,7 @@
|
|||
}
|
||||
|
||||
.notification__filter-bar,
|
||||
.search__filter-bar,
|
||||
.account__section-headline {
|
||||
border-bottom: 1px solid var(--brand-color--faint);
|
||||
cursor: default;
|
||||
|
|
Loading…
Reference in a new issue