Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 00:47:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix PopupsIdentity layout

Browse source
This commit is contained in:
djmaze 2021-11-16 09:33:31 +01:00
parent ac7370103e
commit c46d4b8c02
5 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Styles/Admin/Plugin.less
View file

@ -2,10 +2,6 @@
max-width: 660px; max-width: 660px;
.modal-body {
overflow: auto;
}
.information { .information {
display: inline-block; display: inline-block;
background-color: #ddd; background-color: #ddd;

5
dev/Styles/User/Identity.less
View file

@ -2,14 +2,9 @@
max-width: 770px; max-width: 770px;
.modal-body {
overflow: hidden;
}
.e-signature-place { .e-signature-place {
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 3px; border-radius: 3px;
height: 200px;
} }
.textEmail { .textEmail {

3
dev/Styles/User/SquireUI.less
View file

@ -148,10 +148,13 @@ Secondly, we can't rely on MUA's what to do with :empty
white-space: pre-wrap; white-space: pre-wrap;
width: 100%; width: 100%;
} }
.squire-mode-wysiwyg .squire-plain,
.squire-mode-plain .squire-wysiwyg, .squire-mode-plain .squire-wysiwyg,
.squire-mode-plain .btn-group:not(#squire-toolgroup-mode) { .squire-mode-plain .btn-group:not(#squire-toolgroup-mode) {
display: none; display: none;
} }
.squire-mode-plain .squire-plain { .squire-mode-plain .squire-plain {
display: block; display: block;
} }

5
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
View file

@ -255,10 +255,7 @@ trait Accounts
$order = \json_decode($orderString, true) ?? []; $order = \json_decode($orderString, true) ?? [];
if (isset($order['Identities']) && \is_array($order['Identities']) && 1 < \count($order['Identities'])) { if (isset($order['Identities']) && \is_array($order['Identities']) && 1 < \count($order['Identities'])) {
$list = \array_map(function ($item) { $list = \array_map(function ($item) {
if ('' === $item) { return ('' === $item) ? '---' : $item;
$item = '---';
}
return $item;
}, $order['Identities']); }, $order['Identities']);
\usort($identities, function ($a, $b) use ($list) { \usort($identities, function ($a, $b) use ($list) {

22
snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
View file

@ -65,20 +65,16 @@
</div> </div>
</div> </div>
<hr /> <hr />
<div class="form-horizontal"> <div class="control-group g-ui-user-select-none">
<div class="control-group g-ui-user-select-none"> <div class="controls" data-bind="component: {
<div class="controls" data-bind="component: { name: 'Checkbox',
name: 'Checkbox', params: {
params: { label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE', value: signatureInsertBefore
value: signatureInsertBefore }
} }"></div>
}"></div>
</div>
<div class="control-group">
<div class="e-signature-place" data-bind="editor: signature"></div>
</div>
</div> </div>
<div class="e-signature-place" data-bind="editor: signature"></div>
</div> </div>
<footer> <footer>
<a class="btn buttonAddIdentity" data-bind="command: addOrEditIdentityCommand"> <a class="btn buttonAddIdentity" data-bind="command: addOrEditIdentityCommand">