Merge branch 'pr-elastic-attachments' of https://github.com/thomascube/roundcubemail into thomascube-pr-elastic-attachments

pull/6759/merge
Aleksander Machniak 5 years ago
commit 14849be400

@ -1197,7 +1197,7 @@ function rcmail_compose_attachment_list($attrib)
if (!$attrib['id']) if (!$attrib['id'])
$attrib['id'] = 'rcmAttachmentList'; $attrib['id'] = 'rcmAttachmentList';
$out = "\n"; $out = "";
$jslist = array(); $jslist = array();
$button = ''; $button = '';

@ -93,6 +93,9 @@
@color-list-icon: fadeout(@color-list-secondary, 25%); @color-list-icon: fadeout(@color-list-secondary, 25%);
@color-list-unread-status: @color-warning; @color-list-unread-status: @color-warning;
@color-attachmentlist-border: #f4f4f4;
@color-attachmentlist-background: #fcfcfc;
// Drag-n-drop layer // Drag-n-drop layer
@color-drag-layer: #fff; @color-drag-layer: #fff;
@color-drag-layer-background: @color-taskmenu-background; @color-drag-layer-background: @color-taskmenu-background;

@ -871,6 +871,7 @@ html.ms .propform {
position: relative; position: relative;
display: flex; display: flex;
padding-right: 1.5em; padding-right: 1.5em;
margin: 0.15em 0;
a.filename { a.filename {
flex: 1; flex: 1;
@ -879,7 +880,7 @@ html.ms .propform {
a.delete, a.delete,
a.cancelupload { a.cancelupload {
position: absolute; position: absolute;
right: 0; right: 0.25em;
width: auto; // fix button width if the widget is in a .popupmenu width: auto; // fix button width if the widget is in a .popupmenu
&:before { &:before {

@ -807,11 +807,20 @@ html.touch {
padding: 0; padding: 0;
margin: 0; margin: 0;
background-color: @color-attachmentlist-background;
border: 1px solid @color-attachmentlist-border;
&:empty {
padding: 0;
border: 0;
}
li { li {
list-style: none; list-style: none;
display: inline-flex; display: inline-flex;
white-space: nowrap; white-space: nowrap;
line-height: @attachmentslist-item-height; line-height: @attachmentslist-item-height;
padding: 0 .25em;
max-width: 100%; max-width: 100%;
&:before { &:before {

Loading…
Cancel
Save