diff options
Diffstat (limited to 'client/src/app')
4 files changed, 23 insertions, 22 deletions
diff --git a/client/src/app/shared/video/abstract-video-list.scss b/client/src/app/shared/video/abstract-video-list.scss index a1d9168de..9d481d6e4 100644 --- a/client/src/app/shared/video/abstract-video-list.scss +++ b/client/src/app/shared/video/abstract-video-list.scss | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | .margin-content { | 27 | .margin-content { |
28 | width: $video-miniature-width * 6; | 28 | width: $video-miniature-width * 6; |
29 | margin: auto; | 29 | margin: auto !important; |
30 | 30 | ||
31 | @media screen and (max-width: 1800px) { | 31 | @media screen and (max-width: 1800px) { |
32 | width: $video-miniature-width * 5; | 32 | width: $video-miniature-width * 5; |
diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss index 80d6c4fda..6e173af99 100644 --- a/client/src/app/shared/video/video-miniature.component.scss +++ b/client/src/app/shared/video/video-miniature.component.scss | |||
@@ -64,16 +64,16 @@ | |||
64 | margin-right: 10px; | 64 | margin-right: 10px; |
65 | 65 | ||
66 | /deep/ .dropdown-root:not(.show) { | 66 | /deep/ .dropdown-root:not(.show) { |
67 | display: none; | 67 | opacity: 0; |
68 | } | 68 | } |
69 | 69 | ||
70 | /deep/ .playlist-dropdown.show + my-action-dropdown .dropdown-root { | 70 | /deep/ .playlist-dropdown.show + my-action-dropdown .dropdown-root { |
71 | display: block; | 71 | opacity: 1; |
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | &:hover .video-actions /deep/ .dropdown-root { | 75 | &:hover .video-actions /deep/ .dropdown-root { |
76 | display: block; | 76 | opacity: 1; |
77 | } | 77 | } |
78 | 78 | ||
79 | @media screen and (max-width: $small-view) { | 79 | @media screen and (max-width: $small-view) { |
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 7755a729a..7e9b89dd0 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -36,25 +36,27 @@ | |||
36 | </div> | 36 | </div> |
37 | </div> | 37 | </div> |
38 | 38 | ||
39 | <div i18n class="alert alert-warning" *ngIf="isVideoToImport()"> | 39 | <div class="row"> |
40 | The video is being imported, it will be available when the import is finished. | 40 | <div i18n class="col-md-12 alert alert-warning" *ngIf="isVideoToImport()"> |
41 | </div> | 41 | The video is being imported, it will be available when the import is finished. |
42 | </div> | ||
42 | 43 | ||
43 | <div i18n class="alert alert-warning" *ngIf="isVideoToTranscode()"> | 44 | <div i18n class="col-md-12 alert alert-warning" *ngIf="isVideoToTranscode()"> |
44 | The video is being transcoded, it may not work properly. | 45 | The video is being transcoded, it may not work properly. |
45 | </div> | 46 | </div> |
46 | 47 | ||
47 | <div i18n class="alert alert-info" *ngIf="hasVideoScheduledPublication()"> | 48 | <div i18n class="col-md-12 alert alert-info" *ngIf="hasVideoScheduledPublication()"> |
48 | This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}. | 49 | This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}. |
49 | </div> | 50 | </div> |
50 | 51 | ||
51 | <div i18n class="alert alert-info" *ngIf="noPlaylistVideos"> | 52 | <div i18n class="col-md-12 alert alert-info" *ngIf="noPlaylistVideos"> |
52 | This playlist does not have videos. | 53 | This playlist does not have videos. |
53 | </div> | 54 | </div> |
54 | 55 | ||
55 | <div class="alert alert-danger" *ngIf="video?.blacklisted"> | 56 | <div class="col-md-12 alert alert-danger" *ngIf="video?.blacklisted"> |
56 | <div class="blacklisted-label" i18n>This video is blacklisted.</div> | 57 | <div class="blacklisted-label" i18n>This video is blacklisted.</div> |
57 | {{ video.blacklistedReason }} | 58 | {{ video.blacklistedReason }} |
59 | </div> | ||
58 | </div> | 60 | </div> |
59 | 61 | ||
60 | <!-- Video information --> | 62 | <!-- Video information --> |
@@ -225,7 +227,7 @@ | |||
225 | <my-recommended-videos [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }" [user]="user"></my-recommended-videos> | 227 | <my-recommended-videos [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }" [user]="user"></my-recommended-videos> |
226 | </div> | 228 | </div> |
227 | 229 | ||
228 | <div class="privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false"> | 230 | <div class="row privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false"> |
229 | <div class="privacy-concerns-text"> | 231 | <div class="privacy-concerns-text"> |
230 | <strong i18n>Friendly Reminder: </strong> | 232 | <strong i18n>Friendly Reminder: </strong> |
231 | <ng-container i18n> | 233 | <ng-container i18n> |
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 84b9aed39..de932c99d 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -156,6 +156,7 @@ $player-factor: 1.7; // 16/9 | |||
156 | 156 | ||
157 | .alert { | 157 | .alert { |
158 | text-align: center; | 158 | text-align: center; |
159 | border-radius: 0; | ||
159 | } | 160 | } |
160 | 161 | ||
161 | #video-not-found { | 162 | #video-not-found { |
@@ -427,7 +428,6 @@ my-video-comments { | |||
427 | // If the view is not expanded, take into account the menu | 428 | // If the view is not expanded, take into account the menu |
428 | .privacy-concerns { | 429 | .privacy-concerns { |
429 | width: calc(100% - #{$menu-width}); | 430 | width: calc(100% - #{$menu-width}); |
430 | margin-left: -15px; | ||
431 | } | 431 | } |
432 | 432 | ||
433 | @media screen and (max-width: $small-view) { | 433 | @media screen and (max-width: $small-view) { |
@@ -439,7 +439,6 @@ my-video-comments { | |||
439 | :host-context(.expanded) { | 439 | :host-context(.expanded) { |
440 | .privacy-concerns { | 440 | .privacy-concerns { |
441 | width: 100%; | 441 | width: 100%; |
442 | margin-left: 0; | ||
443 | } | 442 | } |
444 | } | 443 | } |
445 | 444 | ||