vcard_attachments plugin support

pull/5742/merge
Aleksander Machniak 7 years ago
parent a2856493b8
commit 5e14533422

@ -190,7 +190,6 @@ td.editfield { width: 99%; /* TODO */ }
} }
.attachmentslist { .attachmentslist {
padding: 0;
list-style: none; list-style: none;
li { li {

@ -541,6 +541,7 @@ table.fixedcopy {
&:extend(.font-icon-class); &:extend(.font-icon-class);
&:before { &:before {
margin: 0;
content: @fa-var-paperclip; content: @fa-var-paperclip;
} }
&.report:before { &.report:before {
@ -549,6 +550,9 @@ table.fixedcopy {
&.encrypted:before { &.encrypted:before {
content: @fa-var-lock; content: @fa-var-lock;
} }
&.vcard:before {
content: @fa-var-user-o; /* vcard_attachments plugin */
}
} }
span.flagged:before { span.flagged:before {
@ -582,6 +586,9 @@ html.touch {
/* Attachments list */ /* Attachments list */
.attachmentslist {
padding: 0;
}
.attachmentslist li { .attachmentslist li {
display: inline-block; display: inline-block;
line-height: 1.25em; line-height: 1.25em;

@ -77,4 +77,23 @@
&.alert-danger > i.icon:before { &.alert-danger > i.icon:before {
content: @fa-var-exclamation-circle; content: @fa-var-exclamation-circle;
} }
&.vcardattachment > i.icon:before {
content: @fa-var-vcard; /* vcard_attachments plugin */
}
/* This works with following structure: <i> <span> [button].
<span> here is a one-line text, and button can be anything but <span>.
*/
&.aligned-buttons {
display: flex;
span {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
line-height: 2.6;
}
}
} }

@ -501,8 +501,8 @@ function rcube_elastic_ui()
}); });
// Make message-objects alerts pretty (the same as UI alerts) // Make message-objects alerts pretty (the same as UI alerts)
$('#message-objects').children('div').each(function() { $('#message-objects').children().each(function() {
alert_style(this, $(this).attr('class')); alert_style(this, $(this).attr('class').split(/\s/)[0]);
$('a', this).addClass('btn btn-primary'); $('a', this).addClass('btn btn-primary');
}); });
@ -1022,10 +1022,6 @@ function rcube_elastic_ui()
$(p.object).attr('role', 'alert'); $(p.object).attr('role', 'alert');
$('a', p.object).addClass('alert-link'); $('a', p.object).addClass('alert-link');
/* /*
var siblings = $(p.object).siblings('div');
if (siblings.length)
$(p.object).insertBefore(siblings.first());
// show a popup dialog on errors // show a popup dialog on errors
if (p.type == 'error' && rcmail.env.task != 'login') { if (p.type == 'error' && rcmail.env.task != 'login') {
// hide original message object, we don't want both // hide original message object, we don't want both
@ -1046,7 +1042,8 @@ function rcube_elastic_ui()
notice: 'alert-info', notice: 'alert-info',
error: 'alert-danger', error: 'alert-danger',
warning: 'alert-warning', warning: 'alert-warning',
loading: 'alert-info loading' loading: 'alert-info loading',
vcardattachment: 'alert-info' /* vcard_attachments plugin */
}; };
if (cl = map[type]) { if (cl = map[type]) {

Loading…
Cancel
Save