Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Fix the broken richtext HTML popup styles.

Kailash Nadhfbcaba26725f
diff --git a/i18n/en.json b/i18n/en.json
index 16a3ed69..29fdf405 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -91,7 +91,6 @@
"campaigns.editor.rowDelete": "Delete row",
"campaigns.editor.shortcuts": "Keyboard shortcuts",
"campaigns.editor.source": "Source",
- "campaigns.editor.sourceCode": "Source code",
"campaigns.editor.specialChar": "Special character",
"campaigns.editor.strikethrough": "Strikethrough",
"campaigns.editor.subscript": "Subscript",
diff --git a/static/admin/assets/css/richtext.css b/static/admin/assets/css/richtext.css
index 64f8cf57..15430858 100644
--- a/static/admin/assets/css/richtext.css
+++ b/static/admin/assets/css/richtext.css
@@ -35,6 +35,7 @@ richtext-editor {
}
.rte-toolbar button {
+ flex: none;
padding: 0.4rem;
line-height: 0;
}
@@ -235,16 +236,25 @@ richtext-editor {
}
.rte-dialog-code .dialog-card {
- width: min(920px, 95vw);
+ min-width: 0;
}
.rte-dialog[data-rte-dialog="image"] label[data-field] {
margin-block-start: var(--space-4);
}
-.rte-dialog [data-rte-code],
.rte-dialog [data-rte-code] .code-editor {
- min-height: 50vh;
+ display: block;
+ height: 70vh;
+ min-height: 0;
+}
+
+.rte-dialog [data-rte-code] .code-editor > div {
+ height: 100%;
+}
+
+.rte-dialog [data-rte-code] .cm-scroller {
+ overflow: auto;
}
.rte-img-dims {
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.css
index f6f6e135..46a6fcd4 100644
--- a/static/admin/assets/css/style.css
+++ b/static/admin/assets/css/style.css
@@ -1049,7 +1049,8 @@ td > .empty-state {
width: min(100% - 2rem, 24rem);
}
-.preview-modal {
+.preview-modal,
+.rte-dialog-code {
padding: 0;
position: fixed;
width: 100%;
diff --git a/static/admin/partials/richtext-editor.html b/static/admin/partials/richtext-editor.html
index 90446d0a..c77eefbe 100644
--- a/static/admin/partials/richtext-editor.html
+++ b/static/admin/partials/richtext-editor.html
@@ -103,6 +103,7 @@
</div>
</ot-dropdown>
<button type="button" class="ghost" data-cmd="removeformat" title="{{ $L.T "campaigns.editor.removeFormat" }}" aria-label="{{ $L.T "campaigns.editor.removeFormat" }}">{{ Icon "remove-format" $f }}</button>
+ <button type="button" class="ghost" data-cmd="source" title="HTML" aria-label="HTML">{{ Icon "code" $f }}</button>
</div>
{{- /* Insert */}}
@@ -148,17 +149,19 @@
</div>
</ot-dropdown>
- <button type="button" class="ghost" data-cmd="source" title="{{ $L.T "campaigns.editor.sourceCode" }}" aria-label="{{ $L.T "campaigns.editor.sourceCode" }}">{{ Icon "code" $f }}</button>
<button type="button" class="ghost" data-cmd="fullscreen" title="{{ $L.T "campaigns.editor.fullscreen" }}" aria-label="{{ $L.T "campaigns.editor.fullscreen" }}">{{ Icon "maximize" $f }}</button>
<button type="button" class="ghost" data-cmd="help" title="{{ $L.T "campaigns.editor.help" }}" aria-label="{{ $L.T "campaigns.editor.help" }}">{{ Icon "help-circle" $f }}</button>
</div>
+ {{- /* Keep source code visible after the tools and before the overflow control. */}}
+
{{- /* Overflow: toolbar groups that don't fit on one line are relocated
here by richtext-editor.js. Hidden until it has something to hold. */}}
<ot-dropdown class="rte-overflow" hidden>
<button type="button" class="ghost" popovertarget="rte-overflow-menu" title="{{ $L.T "campaigns.editor.more" }}" aria-label="{{ $L.T "campaigns.editor.more" }}">{{ Icon "more-vertical" $f }}</button>
<menu popover id="rte-overflow-menu" class="rte-overflow-menu"></menu>
</ot-dropdown>
+
</div>
<div class="rte-content" data-rte-content></div>
@@ -228,7 +231,7 @@
{{- /* Source code */}}
<dialog class="rte-dialog rte-dialog-code" data-rte-dialog="source">
<div class="dialog-card">
- <header class="dialog-head"><h4 class="dialog-title">{{ $L.T "campaigns.editor.sourceCode" }}</h4></header>
+ <header class="dialog-head"><h4 class="dialog-title">HTML</h4></header>
<section class="dialog-body" data-rte-code></section>
<footer class="dialog-foot align-right">
<button type="button" class="outline" data-rte-act="format">{{ $L.T "campaigns.formatHTML" }}</button>