remerge with master

pull/153/head
cmcnulty 11 years ago
parent 1f70596882
commit c503ee45ed

@ -255,7 +255,6 @@ function rcmail_message_list($attrib)
// save some variables for use in ajax list // save some variables for use in ajax list
$_SESSION['list_attrib'] = $attrib; $_SESSION['list_attrib'] = $attrib;
// make sure 'threads' and 'subject' columns are present // make sure 'threads' and 'subject' columns are present
if (!in_array('subject', $a_show_cols)) if (!in_array('subject', $a_show_cols))
array_unshift($a_show_cols, 'subject'); array_unshift($a_show_cols, 'subject');

@ -74,7 +74,7 @@ input.button:active {
left: 10px; left: 10px;
} }
.records-table tr.selected td, .records-table tr.focused > td.focus { .records-table tr.selected td {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0);
} }

@ -175,7 +175,7 @@
</div> </div>
<div id="listoptions" class="propform popupdialog"> <div id="listoptions" class="propform popupdialog">
<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" /> <roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
<fieldset class="floating"> <fieldset class="floating">
<legend><roundcube:label name="listcolumns" /></legend> <legend><roundcube:label name="listcolumns" /></legend>
<ul class="proplist"> <ul class="proplist">

Loading…
Cancel
Save