summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-03-05 11:38:44 +0000
committeralecpl <alec@alec.pl>2012-03-05 11:38:44 +0000
commit6205a30c81eab281d792edf863b6ba7b0e8804b8 (patch)
treed24bc84dacfeb320ca9a17dee97e84b3eccd703f
parent66d2152ab57b1267552c75243919945b1ffc49bb (diff)
- Fix displaying HTML messages from Disqus (#1488372)
-rw-r--r--CHANGELOG1
-rw-r--r--skins/default/common.css20
-rw-r--r--skins/default/ie6hacks.css8
-rw-r--r--skins/default/iehacks.css2
4 files changed, 16 insertions, 15 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7f3cd7bf2..59c44b964 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix displaying HTML messages from Disqus (#1488372)
- Exclude E_STRICT from error_reporting for PHP 5.4
- Copy all skins in installto script (#1488376)
- Prevent from folder selection on virtual folder collapsing (#1488346)
diff --git a/skins/default/common.css b/skins/default/common.css
index f1c66b9f1..f84c9e6b6 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -154,7 +154,7 @@ img
left: 20px;
}
-#header
+body > #header
{
position: absolute;
top: 8px;
@@ -212,7 +212,7 @@ img
background-position: 0 -75px;
}
-#message
+body > #message
{
position: absolute;
display: none;
@@ -223,7 +223,7 @@ img
opacity: 0.85;
}
-#message div
+body > #message div
{
width: 400px;
margin: 0px;
@@ -231,8 +231,8 @@ img
padding: 8px 10px 8px 46px;
}
-#message div.notice,
-#messagebody .part-notice,
+body > #message div.notice,
+body > #messagebody .part-notice,
#message-objects div.notice
{
background: url(images/display/icons.png) 6px 3px no-repeat;
@@ -240,8 +240,8 @@ img
border: 1px solid #C2D071;
}
-#message div.error,
-#message div.warning,
+body > #message div.error,
+body > #message div.warning,
#message-objects div.warning,
#message-objects div.error
{
@@ -250,7 +250,7 @@ img
border: 1px solid #DC5757;
}
-#message div.confirmation,
+body > #message div.confirmation,
#message-objects div.confirmation
{
background: url(images/display/icons.png) 6px -47px no-repeat;
@@ -258,7 +258,7 @@ img
border: 1px solid #76C83F;
}
-#message div.loading,
+body > #message div.loading,
#message-objects div.loading
{
background: url(images/display/loading.gif) 6px 3px no-repeat;
@@ -266,7 +266,7 @@ img
border: 1px solid #CCCCCC;
}
-#message a
+body > #message a
{
cursor: pointer;
text-decoration: underline;
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index dc7f24a2e..53a2e5e1d 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -16,10 +16,10 @@ img
height: 47px;
}
-#message div.notice,
-#message div.error,
-#message div.warning,
-#message div.confirmation,
+body > #message div.notice,
+body > #message div.error,
+body > #message div.warning,
+body > #message div.confirmation,
#message-objects div.notice,
#message-objects div.error,
#message-objects div.warning,
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index f94dae81d..d09be3d80 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -38,7 +38,7 @@ body.iframe #prefs-details
filter: alpha(opacity=35);
}
-#message
+body > #message
{
filter: alpha(opacity=85);
}