Apply remaining changes
This commit is contained in:
@@ -1448,6 +1448,31 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.slide-preview-text-content {
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.slide-preview-text-content > * {
|
||||
margin: 1em 0;
|
||||
}
|
||||
|
||||
.slide-preview-text-content > *:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.slide-preview-text-content > *:last-child {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.slide-preview-text-content ul,
|
||||
.slide-preview-text-content ol {
|
||||
padding-left: 1.2em;
|
||||
}
|
||||
|
||||
.slide-preview-text-content code {
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
.slide-preview-image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
var fontSize = style && style.font_size ? 'font-size:' + Math.max(1, Math.round(Number(style.font_size))) + 'px;' : '';
|
||||
var width = Math.max(1, Math.round(Number(region && region.width ? region.width : 0) || 1));
|
||||
var height = Math.max(1, Math.round(Number(region && region.height ? region.height : 0) || 1));
|
||||
var wrapperStyle = 'width:' + width + 'px;height:' + height + 'px;overflow:hidden;' + fontFamily + fontSize + color;
|
||||
var wrapperStyle = 'width:' + width + 'px;height:' + height + 'px;overflow:hidden;line-height:1.5;' + fontFamily + fontSize + color;
|
||||
return '<div class="slide-preview-text-content" style="' + wrapperStyle + '">' + sanitizePreviewHtml(raw) + '</div>';
|
||||
}
|
||||
|
||||
|
||||
@@ -295,7 +295,7 @@ module.exports = function registerPlaylistRoutes(app, deps) {
|
||||
};
|
||||
await savePlaylistItems(connection, playlist, req.body, actorId, { updatePlaylist: false });
|
||||
await connection.commit();
|
||||
redirectAfterSave(req, res, '/playlists?edit=' + result.insertId, {
|
||||
redirectAfterSave(req, res, '/playlists/' + result.insertId + '/edit', {
|
||||
closeUrl: '/playlists',
|
||||
newUrl: '/playlists/new',
|
||||
message: 'Playlist created.'
|
||||
@@ -352,7 +352,7 @@ module.exports = function registerPlaylistRoutes(app, deps) {
|
||||
await connection.commit();
|
||||
await notifyPlayerScreens(saveResult.affectedScreens, 'refresh');
|
||||
await broadcastDashboardState();
|
||||
redirectAfterSave(req, res, '/playlists?edit=' + playlist.id, {
|
||||
redirectAfterSave(req, res, '/playlists/' + playlist.id + '/edit', {
|
||||
closeUrl: '/playlists',
|
||||
newUrl: '/playlists/new',
|
||||
message: 'Playlist updated.'
|
||||
|
||||
@@ -27,6 +27,31 @@
|
||||
box-sizing: border-box;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.slide-preview-text-content {
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.slide-preview-text-content > * {
|
||||
margin: 1em 0;
|
||||
}
|
||||
|
||||
.slide-preview-text-content > *:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.slide-preview-text-content > *:last-child {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.slide-preview-text-content ul,
|
||||
.slide-preview-text-content ol {
|
||||
padding-left: 1.2em;
|
||||
}
|
||||
|
||||
.slide-preview-text-content code {
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
</style>
|
||||
|
||||
<div class="slide-preview-popup-stage" id="popup-preview-stage">
|
||||
|
||||
Reference in New Issue
Block a user