diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-12 12:27:37 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-12 12:27:37 +0200 |
commit | 46788f21f6c5b4bb301ae60f657b0b75d072aecd (patch) | |
tree | 83f0e57b6b8a98756b14f47ec326555d977da9c4 | |
parent | d39db21a883d71d101912c0e6e42e97927edb693 (diff) | |
download | PeerTube-46788f21f6c5b4bb301ae60f657b0b75d072aecd.tar.gz PeerTube-46788f21f6c5b4bb301ae60f657b0b75d072aecd.tar.zst PeerTube-46788f21f6c5b4bb301ae60f657b0b75d072aecd.zip |
switch margin-bottom rules to padding-bottom now used in miniature
3 files changed, 12 insertions, 6 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index e0d41117a..2e083982e 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -122,7 +122,7 @@ $video-info-margin-left: 44px; | |||
122 | 122 | ||
123 | .video-bottom { | 123 | .video-bottom { |
124 | display: flex; | 124 | display: flex; |
125 | margin-top: 40px; | 125 | margin-top: 1.5rem; |
126 | 126 | ||
127 | .video-info { | 127 | .video-info { |
128 | flex-grow: 1; | 128 | flex-grow: 1; |
@@ -418,7 +418,7 @@ $video-info-margin-left: 44px; | |||
418 | display: flex; | 418 | display: flex; |
419 | width: max-content; | 419 | width: max-content; |
420 | height: 100%; | 420 | height: 100%; |
421 | margin-bottom: 20px; | 421 | padding-bottom: 20px; |
422 | flex-wrap: wrap; | 422 | flex-wrap: wrap; |
423 | } | 423 | } |
424 | 424 | ||
@@ -552,7 +552,7 @@ my-video-comments { | |||
552 | @media screen and (max-width: 600px) { | 552 | @media screen and (max-width: 600px) { |
553 | .video-bottom { | 553 | .video-bottom { |
554 | margin-top: 20px !important; | 554 | margin-top: 20px !important; |
555 | margin-bottom: 20px !important; | 555 | padding-bottom: 20px !important; |
556 | 556 | ||
557 | .video-info { | 557 | .video-info { |
558 | padding: 0; | 558 | padding: 0; |
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.html b/client/src/app/videos/recommendations/recommended-videos.component.html index e4568c309..a40266028 100644 --- a/client/src/app/videos/recommendations/recommended-videos.component.html +++ b/client/src/app/videos/recommendations/recommended-videos.component.html | |||
@@ -12,11 +12,13 @@ | |||
12 | </div> | 12 | </div> |
13 | </div> | 13 | </div> |
14 | 14 | ||
15 | <div *ngFor="let video of (videos$ | async); let i = index; let length = count"> | 15 | <ng-container *ngFor="let video of (videos$ | async); let i = index; let length = count"> |
16 | <my-video-miniature [displayOptions]="displayOptions" [video]="video" [user]="user" (videoBlocked)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()"> | 16 | <my-video-miniature |
17 | [displayOptions]="displayOptions" [video]="video" [user]="user" | ||
18 | (videoBlocked)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()"> | ||
17 | </my-video-miniature> | 19 | </my-video-miniature> |
18 | 20 | ||
19 | <hr *ngIf="!playlist && i == 0 && length > 1" /> | 21 | <hr *ngIf="!playlist && i == 0 && length > 1" /> |
20 | </div> | 22 | </ng-container> |
21 | </ng-container> | 23 | </ng-container> |
22 | </div> | 24 | </div> |
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.scss b/client/src/app/videos/recommendations/recommended-videos.component.scss index cde62f87f..b278c9654 100644 --- a/client/src/app/videos/recommendations/recommended-videos.component.scss +++ b/client/src/app/videos/recommendations/recommended-videos.component.scss | |||
@@ -25,3 +25,7 @@ | |||
25 | font-weight: 600; | 25 | font-weight: 600; |
26 | } | 26 | } |
27 | } | 27 | } |
28 | |||
29 | hr { | ||
30 | margin-top: 0; | ||
31 | } | ||