diff --git a/plugins/compact-composer/css/composer.css b/plugins/compact-composer/css/composer.css
index 143a3e1cf..8e0bfff15 100644
--- a/plugins/compact-composer/css/composer.css
+++ b/plugins/compact-composer/css/composer.css
@@ -1,4 +1,4 @@
-.squire-toolbar {
+.CompactComposer .squire-toolbar {
padding-top: 4px;
padding-bottom: 0;
overflow: visible;
@@ -7,13 +7,13 @@
min-height: auto;
}
-.squire-toolbar > .btn-group {
+.CompactComposer .squire-toolbar > .btn-group {
margin-bottom: 4px;
}
-.squire-toolbar > .btn-group > a.btn,
-.squire-toolbar button.btn,
-.squire-toolbar select.btn {
+.CompactComposer .squire-toolbar > .btn-group > a.btn,
+.CompactComposer .squire-toolbar button.btn,
+.CompactComposer .squire-toolbar select.btn {
line-height: 20px;
padding-top: 4px;
padding-bottom: 4px;
@@ -41,6 +41,10 @@
display: block;
fill: var(--dialog-clr, #333);
}
+.squire-toolbar-menu .squire-toolbar-svg-icon {
+ display: block;
+ fill: var(--dropdown-menu-color, inherit);
+}
.squire2-mode-wysiwyg .squire-plain,
.squire2-mode-source .squire-wysiwyg,
@@ -53,11 +57,11 @@
display: block;
}
-.squire-toolbar > .squire-toolbar-menu-wrap:last-child {
+.CompactComposer .squire-toolbar > .squire-toolbar-menu-wrap:last-child {
float: right;
}
-.squire-toolbar.mode-plain .squire-html-mode-item {
+.CompactComposer .squire-toolbar.mode-plain .squire-html-mode-item {
display: none;
}
@@ -85,4 +89,4 @@
#V-PopupsCompose .compact .attachmentList {
margin: 0;
padding: 0;
-}
\ No newline at end of file
+}
diff --git a/plugins/compact-composer/index.php b/plugins/compact-composer/index.php
index d87e49cca..e40ab5d2a 100644
--- a/plugins/compact-composer/index.php
+++ b/plugins/compact-composer/index.php
@@ -6,15 +6,14 @@ class CompactComposerPlugin extends \RainLoop\Plugins\AbstractPlugin
NAME = 'Compact Composer',
AUTHOR = 'Sergey Mosin',
URL = 'https://github.com/the-djmaze/snappymail/pull/1466',
- VERSION = '1.0.3-beta',
- RELEASE = '2024-03-19',
+ VERSION = '1.0.3',
+ RELEASE = '2024-04-23',
REQUIRED = '2.34.0',
LICENSE = 'AGPL v3',
DESCRIPTION = 'WYSIWYG editor with a compact toolbar';
public function Init(): void
{
-// $this->addTemplate('templates/PopupsCompactCompose.html');
$this->addCss('css/composer.css');
$this->addJs('js/squire-raw.js');
$this->addJs('js/parsel.js');
diff --git a/plugins/compact-composer/js/CompactComposer.js b/plugins/compact-composer/js/CompactComposer.js
index 67e75abc2..c94377c2b 100644
--- a/plugins/compact-composer/js/CompactComposer.js
+++ b/plugins/compact-composer/js/CompactComposer.js
@@ -136,6 +136,7 @@
squire = new win.Squire2(wysiwyg, SquireDefaultConfig);
this.container = container;
+ container.classList.add('CompactComposer');
plain.className = 'squire-plain';
wysiwyg.className = 'squire-wysiwyg';
diff --git a/plugins/compact-composer/templates/PopupsCompactCompose.html b/plugins/compact-composer/templates/PopupsCompactCompose.html
deleted file mode 100644
index 01aafa6af..000000000
--- a/plugins/compact-composer/templates/PopupsCompactCompose.html
+++ /dev/null
@@ -1,202 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-