diff options
author | Chocobozzz <me@florianbigard.com> | 2018-12-20 11:18:29 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-12-20 11:18:29 +0100 |
commit | 4707f410ae44b55e17e1758693dd21cff03b7ef1 (patch) | |
tree | c83e168ba01f834e243baf1b0e8d748fa00b96b9 | |
parent | f8b2c1b4f509c037b9650cca2c5befd21f056df3 (diff) | |
download | PeerTube-4707f410ae44b55e17e1758693dd21cff03b7ef1.tar.gz PeerTube-4707f410ae44b55e17e1758693dd21cff03b7ef1.tar.zst PeerTube-4707f410ae44b55e17e1758693dd21cff03b7ef1.zip |
Fix notification with large message
4 files changed, 26 insertions, 23 deletions
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html index 0374b70ef..e862d5162 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html | |||
@@ -41,7 +41,7 @@ | |||
41 | </td> | 41 | </td> |
42 | 42 | ||
43 | <td class="action-cell"> | 43 | <td class="action-cell"> |
44 | <my-action-dropdown i18n-label label="Actions" [actions]="videoAbuseActions" [entry]="videoAbuse"></my-action-dropdown> | 44 | <my-action-dropdown placement="bottom-right" i18n-label label="Actions" [actions]="videoAbuseActions" [entry]="videoAbuse"></my-action-dropdown> |
45 | </td> | 45 | </td> |
46 | </tr> | 46 | </tr> |
47 | </ng-template> | 47 | </ng-template> |
@@ -62,4 +62,4 @@ | |||
62 | </ng-template> | 62 | </ng-template> |
63 | </p-table> | 63 | </p-table> |
64 | 64 | ||
65 | <my-moderation-comment-modal #moderationCommentModal (commentUpdated)="onModerationCommentUpdated()"></my-moderation-comment-modal> \ No newline at end of file | 65 | <my-moderation-comment-modal #moderationCommentModal (commentUpdated)="onModerationCommentUpdated()"></my-moderation-comment-modal> |
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html index ff4543b97..7cef787d2 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html | |||
@@ -30,7 +30,7 @@ | |||
30 | <td>{{ videoBlacklist.createdAt }}</td> | 30 | <td>{{ videoBlacklist.createdAt }}</td> |
31 | 31 | ||
32 | <td class="action-cell"> | 32 | <td class="action-cell"> |
33 | <my-action-dropdown i18n-label label="Actions" [actions]="videoBlacklistActions" [entry]="videoBlacklist"></my-action-dropdown> | 33 | <my-action-dropdown i18n-label placement="bottom-right" label="Actions" [actions]="videoBlacklistActions" [entry]="videoBlacklist"></my-action-dropdown> |
34 | </td> | 34 | </td> |
35 | </tr> | 35 | </tr> |
36 | </ng-template> | 36 | </ng-template> |
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index 0489c9558..3a60139e1 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html | |||
@@ -40,13 +40,15 @@ | |||
40 | <my-confirm></my-confirm> | 40 | <my-confirm></my-confirm> |
41 | <p-toast position="bottom-right"> | 41 | <p-toast position="bottom-right"> |
42 | <ng-template let-message pTemplate="message"> | 42 | <ng-template let-message pTemplate="message"> |
43 | <div class="message"> | 43 | <div class="notification-block"> |
44 | <h3>{{ message.summary }}</h3> | 44 | <div class="message"> |
45 | <p>{{ message.detail }}</p> | 45 | <h3>{{ message.summary }}</h3> |
46 | </div> | 46 | <p>{{ message.detail }}</p> |
47 | </div> | ||
47 | 48 | ||
48 | <span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span> | 49 | <span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span> |
49 | <span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span> | 50 | <span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span> |
50 | <span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span> | 51 | <span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span> |
52 | </div> | ||
51 | </ng-template> | 53 | </ng-template> |
52 | </p-toast> | 54 | </p-toast> |
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 21452fa16..8b3e0b813 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss | |||
@@ -324,23 +324,24 @@ p-toast { | |||
324 | background-color: #03A9F4 !important; | 324 | background-color: #03A9F4 !important; |
325 | } | 325 | } |
326 | 326 | ||
327 | .message { | 327 | .notification-block { |
328 | float: left; | 328 | display: flex; |
329 | 329 | ||
330 | h3 { | 330 | .message { |
331 | font-size: 21px; | 331 | h3 { |
332 | } | 332 | font-size: 21px; |
333 | } | ||
333 | 334 | ||
334 | p { | 335 | p { |
335 | font-size: 15px; | 336 | font-size: 15px; |
337 | } | ||
336 | } | 338 | } |
337 | } | ||
338 | 339 | ||
339 | .glyphicon { | 340 | .glyphicon { |
340 | float: right; | 341 | font-size: 32px; |
341 | font-size: 32px; | 342 | margin-top: 15px; |
342 | margin-top: 15px; | 343 | margin-right: 5px; |
343 | margin-right: 5px; | 344 | } |
344 | } | 345 | } |
345 | } | 346 | } |
346 | } | 347 | } |