Apply changes from trunk to 0.1-stable

7 files changed, 24 insertions, 81 deletions

diff --git a/skins/default/common.css b/skins/default/common.css
index 82e1d409d..4d41b1465 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -70,6 +70,7 @@ input, textarea
   padding: 1px;
   padding-left: 3px;
   padding-right: 3px;
+  color: #333333;
   background-color: #ffffff;
   border: 1px solid #666666;
 }
diff --git a/skins/default/editor_content.css b/skins/default/editor_content.css
index e8b1c88fe..31a0a592e 100644
--- a/skins/default/editor_content.css
+++ b/skins/default/editor_content.css
@@ -1,61 +1,15 @@
-/* This file contains the CSS data for the editable area(iframe) of TinyMCE */

-/* You can extend this CSS by adding your own CSS file with the the content_css option */

-

-body, td, pre {

-	font-family: Verdana, Arial, Helvetica, sans-serif;

-	font-size: 12px;

-}

-

-body {

+/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
+/* You can extend this CSS by adding your own CSS file with the the content_css option */
+
+body, td, pre {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+}
+  
+body {
 	background-color: #FFFFFF;
 	margin-left: 4px;
 	margin-right: 4px;
 	margin-top: 2px;
-}

-

-.mceVisualAid {

-	border: 1px dashed #BBBBBB !important;

-}

-

-div.mceVisualAid {

-	background-image:url('../images/spacer.gif');

-	visibility: visible !important;

-}

-

-.mceItemAnchor {

-	width: 12px;

-	line-height: 6px;

-	overflow: hidden;

-	padding-left: 12px;

-	background-image: url('../images/anchor_symbol.gif');

-	background-position: bottom;

-	background-repeat: no-repeat;

-}

-

-/* Important is needed in Gecko browsers inorder to style links */

-/*

-a {

-	color: green !important;

-}

-*/

-

-/* Style selection range colors in Gecko browsers */

-/*

-::-moz-selection {

-	background-color: red;

-	color: green;

-}

-*/

-

-/* MSIE specific */

-

-* html body {

-	scrollbar-3dlight-color: #F0F0EE;

-	scrollbar-arrow-color: #676662;

-	scrollbar-base-color: #F0F0EE;

-	scrollbar-darkshadow-color: #DDDDDD;

-	scrollbar-face-color: #E0E0DD;

-	scrollbar-highlight-color: #F0F0EE;

-	scrollbar-shadow-color: #F0F0EE;

-	scrollbar-track-color: #F5F5F5;

-}

+}
+
diff --git a/skins/default/includes/header.html b/skins/default/includes/header.html
index a7e034a0b..2e47ff911 100644
--- a/skins/default/includes/header.html
+++ b/skins/default/includes/header.html
@@ -1,3 +1,3 @@
-<div id="header"><roundcube:button command="mail" image="/images/roundcube_logo.png" alt="RoundCube Webmail" width="165" height="55" /></div>
+<div id="header"><roundcube:button command="mail" image="/images/roundcube_logo.png" alt="RoundCube Webmail" /></div>
 
 <roundcube:object name="message" id="message" />
diff --git a/skins/default/mail.css b/skins/default/mail.css
index aa3f64313..69762b665 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -153,6 +153,9 @@ td.formlinks a:visited
   left: 20px;
   right: 20px;
   bottom: 20px;
+  /* css hack for IE */
+  width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-100)+'px');
 }
 
 #mailcontframe
@@ -202,8 +205,6 @@ td.formlinks a:visited
   height: 100%;
   border: 1px solid #999999;
   background-color: #F9F9F9;
-  /* css hack for IE */
-  height: expression(parseInt(document.getElementById('messagepartcontainer').offsetHeight)+'px');
 }
 
 
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 7ee50f527..9f0c8f3cc 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -69,7 +69,7 @@ span.tablink-selected a
 
 #folder-manager
 {
-  width: 540px;
+  width: 600px;
   bottom: 140px;
   overflow: auto;
   border: 1px solid #999999;
@@ -119,7 +119,7 @@ span.tablink-selected a
 #bottomboxes
 {
   position: absolute;
-  width: 540px;
+  width: 600px;
   height: 120px;
   left: 20px;
   bottom: 20px;
@@ -142,7 +142,7 @@ div.boxtitle,
 
 div.settingsbox
 {
-  width: 540px;
+  width: 600px;
   margin-top: 20px;
   margin-bottom: 20px;
   border: 1px solid #999999;
@@ -185,28 +185,15 @@ div.settingspart
 
 #subscription-table thead td.name
 {
-  width: 240px;
+  width: 250px;
 }
 
 #subscription-table thead td.msgcount
 {
-  width: 70px;
+  width: 90px;
 }
 
 #subscription-table thead td.subscribed
 {
-  width: 60px;
-}
-
-#subscription-table tbody td.msgcount,
-#subscription-table tbody td.subscribed
-{
-  padding-left: 18px;
-}
-
-#subscription-table thead td.rename,
-#subscription-table thead td.delete
-{
-  width: 20px;
-  text-align: center;
+  width: 90px;
 }
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index 1950be2e8..2a48f48bf 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -28,7 +28,7 @@
 </head>
 <body>
 
-<img src="/images/roundcube_logo.png" width="165" height="55" border="0" alt="<roundcube:object name='productname' />" hspace="12" vspace="2"/>
+<img src="/images/roundcube_logo.png" border="0" alt="<roundcube:object name='productname' />" style="margin:2px 12px" />
 
 <roundcube:object name="message" id="message" />
 
diff --git a/skins/default/templates/printmessage.html b/skins/default/templates/printmessage.html
index 223c98b4d..eecff69fb 100644
--- a/skins/default/templates/printmessage.html
+++ b/skins/default/templates/printmessage.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 
-<div id="header"><img src="/images/roundcube_logo_print.gif" width="182" height="50" alt="RoundCube Webmail" /></div>
+<div id="header"><img src="/images/roundcube_logo_print.gif" alt="<roundcube:object name="productname" />" /></div>
 
 <div id="messageframe">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" />