From a0a4288128c21b155cc23d6122c2e11820b9b645 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 03 Jun 2009 02:47:58 -0400
Subject: [PATCH] - use 'browser' expression to hide IE-specific inline styles
---
skins/default/templates/mail.html | 12 ++++--------
skins/default/templates/addressbook.html | 16 +++++++---------
skins/default/templates/message.html | 5 ++---
skins/default/iehacks.css | 4 ++--
4 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index b93d3dc..82c9e99 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -17,7 +17,7 @@
#searchmenu,
#messagemenu
{
- filter:alpha(opacity=90);
+ filter: alpha(opacity=90);
}
#tabsbar
@@ -180,7 +180,7 @@
#rcmdraglayer
{
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
+ filter: alpha(opacity=70);
}
ul.toolbarmenu li
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 2dc92e0..5d684a8 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -8,19 +8,17 @@
<style type="text/css">
<roundcube:if condition="count(env:address_sources) <= 1" />
#abookcountbar { left: 20px;}
-#addressscreen { left:20px; /* IE hack */ width:expression((parseInt(document.documentElement.clientWidth)-40)+'px') }
+#addressscreen { left:20px;
+<roundcube:exp expression="browser:ie ? 'width:expression((parseInt(document.documentElement.clientWidth)-40)+\\'px\\');' : ''" />
+}
#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
-#contacts-box {
- left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
- /* IE hack */
- width:expression((parseInt(addressscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
+#contacts-box { left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
+<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255).'+\\'px\\');') : ''" />
}
<roundcube:else />
#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
-#contacts-box {
- left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
- /* IE hack */
- width:expression((parseInt(addressscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
+#contacts-box { left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
+<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255).'+\\'px\\');') : ''" />
}
<roundcube:endif />
</style>
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 29116f7..1606d1e 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -8,17 +8,13 @@
<style type="text/css">
<roundcube:if condition="config:preview_pane == true" />
#mailcontframe { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-5 : 195" />px; }
-#mailpreviewframe {
- top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px;
- /* css hack for IE */
- height: expression((parseInt(this.parentNode.offsetHeight)-<roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />)+'px');
+#mailpreviewframe { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px;
+<roundcube:exp expression="browser:ie ? ('height: expression((parseInt(this.parentNode.offsetHeight)-'.(!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205).')+\\'px\\');') : ''" />
}
<roundcube:endif />
#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
-#mailrightcontainer {
- left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
- /* css hack for IE */
- width: expression((parseInt(this.parentNode.offsetWidth)-<roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />)+'px');
+#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
+<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170).')+\\'px\\');') : ''" />
}
</style>
</head>
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 24fe76b..c53e7d5 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -7,9 +7,8 @@
<script type="text/javascript" src="/functions.js"></script>
<style type="text/css">
#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
-#messageframe {
- left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
- width: expression((parseInt(this.parentNode.offsetWidth)-<roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />)+'px');
+#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
+<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170).')+\\'px\\');') : ''" />
}
</style>
</head>
--
Gitblit v1.9.1