diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2018-09-03 15:01:52 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2018-09-03 15:10:55 +0200 |
commit | 2303a803aa19c2857efac9f2af2223ccae5757e2 (patch) | |
tree | fd00a3c766d78f698c89df4ff60d145bc776e061 /client/src/app/videos | |
parent | f2e05ffea78255dd431dbddfffff89ac9ff69bdc (diff) | |
download | PeerTube-2303a803aa19c2857efac9f2af2223ccae5757e2.tar.gz PeerTube-2303a803aa19c2857efac9f2af2223ccae5757e2.tar.zst PeerTube-2303a803aa19c2857efac9f2af2223ccae5757e2.zip |
fix likes bar, grid adjustment and menu width
Diffstat (limited to 'client/src/app/videos')
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.html | 6 | ||||
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.scss | 16 |
2 files changed, 8 insertions, 14 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 0f2f3cf11..937f25eb6 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -26,9 +26,9 @@ | |||
26 | </div> | 26 | </div> |
27 | 27 | ||
28 | <!-- Video information --> | 28 | <!-- Video information --> |
29 | <div *ngIf="video" class="container-fluid video-bottom"> | 29 | <div *ngIf="video" class="margin-content video-bottom"> |
30 | <div class="row fullWidth"> | 30 | <div class="row fullWidth"> |
31 | <div class="col-12 col-md-9 video-info"> | 31 | <div class="col-12 col-lg-9 video-info"> |
32 | <div class="video-info-first-row"> | 32 | <div class="video-info-first-row"> |
33 | <div> | 33 | <div> |
34 | <div class="d-block d-sm-none"> <!-- only shown on small devices, has its conterpart for larger viewports below --> | 34 | <div class="d-block d-sm-none"> <!-- only shown on small devices, has its conterpart for larger viewports below --> |
@@ -199,7 +199,7 @@ | |||
199 | 199 | ||
200 | <my-video-comments [video]="video" [user]="user"></my-video-comments> | 200 | <my-video-comments [video]="video" [user]="user"></my-video-comments> |
201 | </div> | 201 | </div> |
202 | <my-recommended-videos class="ml-3 ml-sm-0 col-12 col-md-3" | 202 | <my-recommended-videos class="col-12 col-lg-3" |
203 | [inputVideo]="video" [user]="user"></my-recommended-videos> | 203 | [inputVideo]="video" [user]="user"></my-recommended-videos> |
204 | </div> | 204 | </div> |
205 | </div> | 205 | </div> |
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 912016f8c..633b16c05 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -163,9 +163,9 @@ | |||
163 | } | 163 | } |
164 | 164 | ||
165 | .video-actions-rates { | 165 | .video-actions-rates { |
166 | display: flex; | 166 | margin-top: 20px; |
167 | flex-direction: column; | 167 | margin-bottom: 10px; |
168 | align-items: flex-end; | 168 | align-items: start; |
169 | 169 | ||
170 | .video-actions { | 170 | .video-actions { |
171 | height: 40px; // Align with the title | 171 | height: 40px; // Align with the title |
@@ -442,12 +442,6 @@ | |||
442 | .video-info-first-row { | 442 | .video-info-first-row { |
443 | flex-direction: column; | 443 | flex-direction: column; |
444 | margin-bottom: 20px; | 444 | margin-bottom: 20px; |
445 | |||
446 | .video-actions-rates { | ||
447 | margin-top: 20px; | ||
448 | margin-bottom: 10px; | ||
449 | align-items: start; | ||
450 | } | ||
451 | } | 445 | } |
452 | 446 | ||
453 | .video-info-date-views { | 447 | .video-info-date-views { |
@@ -471,7 +465,7 @@ | |||
471 | flex-direction: column; | 465 | flex-direction: column; |
472 | } | 466 | } |
473 | 467 | ||
474 | .other-videos { | 468 | /deep/ .other-videos { |
475 | padding-left: 0 !important; | 469 | padding-left: 0 !important; |
476 | } | 470 | } |
477 | 471 | ||
@@ -501,7 +495,7 @@ | |||
501 | } | 495 | } |
502 | } | 496 | } |
503 | 497 | ||
504 | .other-videos { | 498 | /deep/ .other-videos { |
505 | /deep/ .video-miniature { | 499 | /deep/ .video-miniature { |
506 | flex-direction: column; | 500 | flex-direction: column; |
507 | } | 501 | } |