- move safari hacks to separate css file

4 files changed, 24 insertions, 9 deletions

diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index bd6e99b29..a64e57e1b 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -152,6 +152,13 @@ body.iframe
   width: 99%;
 }
 
+div.message-part pre,
+div.message-htmlpart pre,
+div.message-part div.pre
+{
+  word-wrap: break-word;
+}
+
 #addressscreen
 {
   width: expression((parseInt(document.documentElement.clientWidth)-220)+'px');
diff --git a/skins/default/includes/links.html b/skins/default/includes/links.html
index 5ef79e896..de8e968e8 100644
--- a/skins/default/includes/links.html
+++ b/skins/default/includes/links.html
@@ -2,5 +2,10 @@
 <link rel="shortcut icon" href="/images/favicon.ico"/>
 <link rel="stylesheet" type="text/css" href="/common.css" />
 <roundcube:if condition="env:task != 'login'" /><link rel="stylesheet" type="text/css" href="/<roundcube:exp expression="env:task=='addressbook'?'addresses':env:task" />.css" /><roundcube:endif />
+<roundcube:if condition="browser:ie" />
 <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="/iehacks.css" /><![endif]-->
-<!--[if lte IE 6]><link rel="stylesheet" type="text/css" href="/ie6hacks.css" /><![endif]-->
\ No newline at end of file
+<!--[if lte IE 6]><link rel="stylesheet" type="text/css" href="/ie6hacks.css" /><![endif]-->
+<roundcube:endif />
+<roundcube:if condition="browser:safari" />
+<link rel="stylesheet" type="text/css" href="/safari.css" />
+<roundcube:endif />
\ No newline at end of file
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 512fca864..8030313e4 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -701,13 +701,6 @@ body.messagelist
   color: #CCCCCC;
 }
 
-/* safari hacks \*/
-html>body*#messagelist[id$="messagelist"]:not([class="none"]) { width: 99.8%; }
-html>body*#messagelist[id$="messagelist"]:not([class="none"]) tr td.flag,
-html>body*#messagelist[id$="messagelist"]:not([class="none"]) tr td.icon { width: 20px; }
-html>body*input[type$="file"]:not([class="none"]) { background-color: transparent; border: 0; }
-/**/
-
 #quotadisplay
 {
   color: #666666;
@@ -889,7 +882,6 @@ div.message-part div.pre
   white-space: -moz-pre-wrap !important;
   white-space: pre-wrap !important;
   white-space: pre;
-  word-wrap: break-word; /* IE (and Safari) */
 }
 
 div.message-part blockquote
diff --git a/skins/default/safari.css b/skins/default/safari.css
new file mode 100644
index 000000000..840fc2baf
--- /dev/null
+++ b/skins/default/safari.css
@@ -0,0 +1,11 @@
+html>body*#messagelist[id$="messagelist"]:not([class="none"]) { width: 99.8%; }
+html>body*#messagelist[id$="messagelist"]:not([class="none"]) tr td.flag,
+html>body*#messagelist[id$="messagelist"]:not([class="none"]) tr td.icon { width: 20px; }
+html>body*input[type$="file"]:not([class="none"]) { background-color: transparent; border: 0; }
+
+div.message-part pre,
+div.message-htmlpart pre,
+div.message-part div.pre
+{
+  word-wrap: break-word;
+}