diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-08-25 11:42:30 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-08-25 11:42:30 +0200 |
| commit | fdec51e3846d50e3375612a6820ed3ab0b5fcd25 (patch) | |
| tree | 17283e85a6794c9e8fe3f5d4478a406d8d188425 /client/src/app/+search | |
| parent | 59c8902a57991be29f0aacac1642389fb770c6ed (diff) | |
| parent | dd24f1bb0a4b252e5342b251ba36853364da7b8e (diff) | |
| download | PeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.tar.gz PeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.tar.zst PeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.zip | |
Merge branch 'feature/video-filters' into develop
Diffstat (limited to 'client/src/app/+search')
| -rw-r--r-- | client/src/app/+search/search-filters.component.scss | 1 | ||||
| -rw-r--r-- | client/src/app/+search/search.component.html | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/client/src/app/+search/search-filters.component.scss b/client/src/app/+search/search-filters.component.scss index 235558b3d..ece4ba5b5 100644 --- a/client/src/app/+search/search-filters.component.scss +++ b/client/src/app/+search/search-filters.component.scss | |||
| @@ -11,7 +11,6 @@ form { | |||
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | .peertube-radio-container { | 13 | .peertube-radio-container { |
| 14 | @include peertube-radio-container; | ||
| 15 | @include margin-right(30px); | 14 | @include margin-right(30px); |
| 16 | 15 | ||
| 17 | display: inline-block; | 16 | display: inline-block; |
diff --git a/client/src/app/+search/search.component.html b/client/src/app/+search/search.component.html index dc8b4d595..412b962d1 100644 --- a/client/src/app/+search/search.component.html +++ b/client/src/app/+search/search.component.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <div myInfiniteScroller [autoInit]="true" (nearOfBottom)="onNearOfBottom()" class="search-result"> | 1 | <div myInfiniteScroller (nearOfBottom)="onNearOfBottom()" class="search-result"> |
| 2 | <div class="results-header"> | 2 | <div class="results-header"> |
| 3 | <div class="first-line"> | 3 | <div class="first-line"> |
| 4 | <div class="results-counter" *ngIf="pagination.totalItems"> | 4 | <div class="results-counter" *ngIf="pagination.totalItems"> |