From c503ee45ed3a50dc45073df985d80d2bb9653c6e Mon Sep 17 00:00:00 2001
From: cmcnulty <cmcnulty@kznf.com>
Date: Sat, 09 Nov 2013 21:55:56 -0500
Subject: [PATCH] remerge with master
---
skins/larry/templates/mail.html | 2 +-
program/steps/mail/func.inc | 1 -
skins/larry/iehacks.css | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9358848..78a977b 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -255,7 +255,6 @@
// save some variables for use in ajax list
$_SESSION['list_attrib'] = $attrib;
-
// make sure 'threads' and 'subject' columns are present
if (!in_array('subject', $a_show_cols))
array_unshift($a_show_cols, 'subject');
diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
index 340e851..960ce76 100644
--- a/skins/larry/iehacks.css
+++ b/skins/larry/iehacks.css
@@ -74,7 +74,7 @@
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);
}
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index f60fe2a..f2c52c8 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -175,7 +175,7 @@
</div>
<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">
<legend><roundcube:label name="listcolumns" /></legend>
<ul class="proplist">
--
Gitblit v1.9.1