mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 07:35:55 +08:00
Merge branch 'master' into sieveparser
# Conflicts: # snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
This commit is contained in:
commit
e093388016
|
@ -47,3 +47,22 @@ html.mobile *, html.rl-mobile * {
|
|||
input[type="search"]{
|
||||
box-sizing: content-box;
|
||||
}
|
||||
|
||||
.button-confirm-delete {
|
||||
margin-right: 15px;
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
}
|
||||
.button-confirm-delete.delete-access {
|
||||
margin-right: 0;
|
||||
opacity: 1;
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.drag-handle {
|
||||
color: #eee;
|
||||
cursor: grab;
|
||||
}
|
||||
tr:hover .drag-handle {
|
||||
color: #aaa;
|
||||
}
|
||||
|
|
|
@ -20,14 +20,6 @@
|
|||
line-height: 30px;
|
||||
}
|
||||
|
||||
.drag-handle {
|
||||
color: #eee;
|
||||
}
|
||||
|
||||
tr:hover .drag-handle {
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.account-img, .identity-img {
|
||||
font-size: 12px;
|
||||
margin-right: 5px;
|
||||
|
@ -68,26 +60,6 @@
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.drag-handle {
|
||||
cursor: pointer;
|
||||
cursor: all-scroll;
|
||||
}
|
||||
|
||||
.button-delete {
|
||||
margin-right: 15px;
|
||||
margin-top: 5px;
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.delete-access {
|
||||
&.button-delete {
|
||||
visibility: visible;
|
||||
margin-right: 0;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.delete-account {
|
||||
cursor: pointer;
|
||||
opacity: 0.5;
|
||||
|
@ -102,21 +74,6 @@
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.button-delete {
|
||||
margin-right: 15px;
|
||||
margin-top: 5px;
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.delete-access {
|
||||
&.button-delete {
|
||||
visibility: visible;
|
||||
margin-right: 0;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.delete-identity {
|
||||
cursor: pointer;
|
||||
opacity: 0.5;
|
||||
|
|
|
@ -24,14 +24,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.drag-handle {
|
||||
color: #eee;
|
||||
}
|
||||
|
||||
tr:hover .drag-handle {
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.filter-img {
|
||||
font-size: 12px;
|
||||
margin-right: 5px;
|
||||
|
@ -64,26 +56,6 @@
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.drag-handle {
|
||||
cursor: pointer;
|
||||
cursor: all-scroll;
|
||||
}
|
||||
|
||||
.button-delete {
|
||||
margin-right: 15px;
|
||||
margin-top: 5px;
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.delete-access {
|
||||
&.button-delete {
|
||||
visibility: visible;
|
||||
margin-right: 0;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.delete-filter {
|
||||
cursor: pointer;
|
||||
opacity: 0.5;
|
||||
|
|
|
@ -82,14 +82,6 @@
|
|||
opacity: 0;
|
||||
}
|
||||
|
||||
.delete-access {
|
||||
&.button-delete {
|
||||
visibility: visible;
|
||||
margin-right: 0;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.delete-folder, .subscribe-folder, .unsubscribe-folder, .check-folder, .uncheck-folder {
|
||||
cursor: pointer;
|
||||
opacity: 0.6;
|
||||
|
|
|
@ -41,21 +41,6 @@
|
|||
|
||||
.open-pgp-key-item {
|
||||
|
||||
.button-delete {
|
||||
margin-right: 15px;
|
||||
margin-top: 5px;
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.delete-access {
|
||||
&.button-delete {
|
||||
visibility: visible;
|
||||
margin-right: 0;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.delete-open-pgp-key, .view-open-pgp-key {
|
||||
cursor: pointer;
|
||||
opacity: 0.7;
|
||||
|
|
|
@ -20,14 +20,6 @@
|
|||
line-height: 30px;
|
||||
}
|
||||
|
||||
.drag-handle {
|
||||
color: #eee;
|
||||
}
|
||||
|
||||
tr:hover .drag-handle {
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.template-img {
|
||||
font-size: 12px;
|
||||
margin-right: 5px;
|
||||
|
@ -53,26 +45,6 @@
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.drag-handle {
|
||||
cursor: pointer;
|
||||
cursor: all-scroll;
|
||||
}
|
||||
|
||||
.button-delete {
|
||||
margin-right: 15px;
|
||||
margin-top: 5px;
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.delete-access {
|
||||
&.button-delete {
|
||||
visibility: visible;
|
||||
margin-right: 0;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.delete-template {
|
||||
cursor: pointer;
|
||||
opacity: 0.5;
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
<span class="account-name" data-bind="text: email"></span>
|
||||
</td>
|
||||
<td>
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oAccount) { $root.deleteAccount(oAccount); }">
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oAccount) { $root.deleteAccount(oAccount); }">
|
||||
<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/DELETING_ASK"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
@ -82,7 +82,7 @@
|
|||
</span>
|
||||
</td>
|
||||
<td>
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }">
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }">
|
||||
<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/DELETING_ASK"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
</td>
|
||||
<td class="e-action" class="script-name" data-bind="text: name()"></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(oScript) { $root.deleteScript(oScript); }">
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oScript) { $root.deleteScript(oScript); }">
|
||||
<span class="i18n" data-i18n="SETTINGS_FILTERS/DELETING_ASK"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
|
||||
data-bind="value: nameForEdit, visible: edited, hasfocus: edited, onEnter: function () { $root.folderEditOnEnter($data); }, onEsc: function () { $root.folderEditOnEsc($data); }" />
|
||||
|
||||
<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() { $root.deleteFolder($data); }">
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function() { $root.deleteFolder($data); }">
|
||||
<span class="i18n" data-i18n="SETTINGS_FOLDERS/DELETING_ASK"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
<div class="open-pgp-key-user-address" data-bind="text: $data"></div>
|
||||
<!-- /ko -->
|
||||
</span>
|
||||
<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(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }">
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }">
|
||||
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
@ -78,7 +78,7 @@
|
|||
</div>
|
||||
<!-- /ko -->
|
||||
</span>
|
||||
<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(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
|
||||
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
<span class="template-name" data-bind="text: name"></span>
|
||||
</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(oTemplate) { $root.deleteTemplate(oTemplate); }">
|
||||
<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess}, click: function(oTemplate) { $root.deleteTemplate(oTemplate); }">
|
||||
<span class="i18n" data-i18n="SETTINGS_TEMPLATES/DELETING_ASK"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
|
Loading…
Reference in a new issue