Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sieveparser

Browse source
This commit is contained in:
djmaze 2021-01-18 09:36:41 +01:00
commit e7da264f4b
4 changed files with 41 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cmds
View file

@ -15,5 +15,5 @@ webpack --color --watch
# #
gpg --import x gpg --import x
gpg --detach-sign --armor --openpgp -u 87DA4591 x gpg --detach-sign --armor --openpgp -u 87DA4591 --passphrase ?? x
for ff in `ls *.zip`; do gpg --detach-sign --armor --openpgp -u 87DA4591 $ff; done for ff in `ls ./build/dist/releases/**/**/*.zip | xargs`; do gpg --detach-sign --no-tty --yes --armor --openpgp -u 87DA4591 --passphrase ?? $ff; done

77
snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
View file

@ -60,46 +60,45 @@
data-bind="value: filterRaw, valueUpdate: 'afterkeydown'"></textarea> data-bind="value: filterRaw, valueUpdate: 'afterkeydown'"></textarea>
</div> </div>
</div> </div>
<div> <div data-bind="visible: inited() && (!filterRaw.active() || !filterRaw.active())">
<div class="filters-list-top-padding"></div> <div class="filters-list-top-padding"></div>
<table class="table table-hover list-table filters-list g-ui-user-select-none" <table class="table table-hover list-table filters-list g-ui-user-select-none"
data-bind="visible: inited() && (!filterRaw.active() || !filterRaw.active()), i18nUpdate: filters"> data-bind="i18nUpdate: filters">
<colgroup> <colgroup>
<col style="width: 30px" /> <col style="width: 30px" />
<col style="width: 16px" /> <col style="width: 16px" />
<col /> <col />
<col style="width: 140px" /> <col style="width: 140px" />
<col style="width: 1%" /> <col style="width: 1%" />
</colgroup> </colgroup>
<tbody data-bind="foreach: filters" style="width: 600px"> <tbody data-bind="foreach: filters" style="width: 600px">
<tr class="filter-item" draggable="true" data-bind="sortableItem: { list: $root.filters }"> <tr class="filter-item" draggable="true" data-bind="sortableItem: { list: $root.filters }">
<td> <td>
<span class="disabled-filter" data-bind="click: function () { $root.haveChanges(true); enabled(!enabled()); }"> <span class="disabled-filter" data-bind="click: function () { $root.haveChanges(true); enabled(!enabled()); }">
<i data-bind="css: {'icon-checkbox-checked': enabled, 'icon-checkbox-unchecked': !enabled()}"></i> <i data-bind="css: {'icon-checkbox-checked': enabled, 'icon-checkbox-unchecked': !enabled()}"></i>
</span> </span>
</td> </td>
<td class="drag-wrapper"> <td class="drag-wrapper">
<i class="icon-braille drag-handle"></i> <i class="icon-braille drag-handle"></i>
</td> </td>
<td class="e-action"> <td class="e-action">
<span class="filter-name" data-bind="text: name()"></span> <span class="filter-name" data-bind="text: name()"></span>
&nbsp;&nbsp; &nbsp;&nbsp;
<span class="filter-sub-name" data-bind="text: nameSub()"></span> <span class="filter-sub-name" data-bind="text: nameSub()"></span>
</td> </td>
<td> <td>
<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oFilter) { $root.deleteFilter(oFilter); }"> <a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oFilter) { $root.deleteFilter(oFilter); }">
<span class="i18n" data-i18n="SETTINGS_FILTERS/DELETING_ASK"></span> <span class="i18n" data-i18n="SETTINGS_FILTERS/DELETING_ASK"></span>
</a> </a>
</td> </td>
<td> <td>
<span class="delete-filter" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oFilter) { $root.filterForDeletion(oFilter); }"> <span class="delete-filter" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oFilter) { $root.filterForDeletion(oFilter); }">
<i class="icon-trash"></i> <i class="icon-trash"></i>
</span> </span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> </div>
</div> </div>

2
tasks/config.js
View file

@ -19,7 +19,7 @@ const config = {
cleanPath: '', cleanPath: '',
zipSrcPath: '', zipSrcPath: '',
zipFile: '', zipFile: '',
zipFileShort: '', // zipFileShort: '',
paths: {} paths: {}
}; };

3
vendors/bootstrap/less/code.less vendored
View file

@ -31,9 +31,6 @@ pre {
margin: 0 0 @baseLineHeight / 2; margin: 0 0 @baseLineHeight / 2;
font-size: @baseFontSize - 1; // 14px to 13px font-size: @baseFontSize - 1; // 14px to 13px
line-height: @baseLineHeight; line-height: @baseLineHeight;
word-break: break-all;
word-wrap: break-word;
white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid rgba(0,0,0,.15); border: 1px solid rgba(0,0,0,.15);