OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix notification with large message

pull/1535/head
Chocobozzz 2018-12-20 11:18:29 +01:00
parent f8b2c1b4f5
commit 4707f410ae
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
View File

@ -41,7 +41,7 @@
</td>
<td class="action-cell">
<my-action-dropdown i18n-label label="Actions" [actions]="videoAbuseActions" [entry]="videoAbuse"></my-action-dropdown>
<my-action-dropdown placement="bottom-right" i18n-label label="Actions" [actions]="videoAbuseActions" [entry]="videoAbuse"></my-action-dropdown>
</td>
</tr>
</ng-template>
@ -62,4 +62,4 @@
</ng-template>
</p-table>
<my-moderation-comment-modal #moderationCommentModal (commentUpdated)="onModerationCommentUpdated()"></my-moderation-comment-modal>
<my-moderation-comment-modal #moderationCommentModal (commentUpdated)="onModerationCommentUpdated()"></my-moderation-comment-modal>

2
client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
View File

@ -30,7 +30,7 @@
<td>{{ videoBlacklist.createdAt }}</td>
<td class="action-cell">
<my-action-dropdown i18n-label label="Actions" [actions]="videoBlacklistActions" [entry]="videoBlacklist"></my-action-dropdown>
<my-action-dropdown i18n-label placement="bottom-right" label="Actions" [actions]="videoBlacklistActions" [entry]="videoBlacklist"></my-action-dropdown>
</td>
</tr>
</ng-template>

16
client/src/app/app.component.html
View File

@ -40,13 +40,15 @@
<my-confirm></my-confirm>
<p-toast position="bottom-right">
<ng-template let-message pTemplate="message">
<div class="message">
<h3>{{ message.summary }}</h3>
<p>{{ message.detail }}</p>
</div>
<div class="notification-block">
<div class="message">
<h3>{{ message.summary }}</h3>
<p>{{ message.detail }}</p>
</div>
<span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span>
<span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span>
<span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span>
<span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span>
<span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span>
<span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span>
</div>
</ng-template>
</p-toast>

27
client/src/sass/primeng-custom.scss
View File

@ -324,23 +324,24 @@ p-toast {
background-color: #03A9F4 !important;
}
.message {
float: left;
.notification-block {
display: flex;
h3 {
font-size: 21px;
.message {
h3 {
font-size: 21px;
}
p {
font-size: 15px;
}
}
p {
font-size: 15px;
.glyphicon {
font-size: 32px;
margin-top: 15px;
margin-right: 5px;
}
}
.glyphicon {
float: right;
font-size: 32px;
margin-top: 15px;
margin-right: 5px;
}
}
}