Apply changes from r2348 to r2400 for 0.2.2 release

7 files changed, 57 insertions, 65 deletions

diff --git a/skins/default/common.css b/skins/default/common.css
index ec2cd526f..34ea1d2b8 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -364,19 +364,13 @@ table.records-table tr.unfocused td
   top: 2px;
   left: 20px;
   width: 140px;
+  height: 15px;
   font-size: 11px;
   padding: 0px;
   border: none;
 }
 
 
-/*\*/
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) { background-image: none; }
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) a { top: 5px; }
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
-/**/
-
-
 /***** roundcube webmail pre-defined classes *****/
 
 #rcversion
diff --git a/skins/default/mail.css b/skins/default/mail.css
index bb614dbd7..5a4e57bfe 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -820,6 +820,7 @@ div.message-htmlpart a
 }
 
 div.message-part pre,
+div.message-htmlpart pre,
 div.message-part div.pre
 {
   margin: 0px;
@@ -918,12 +919,12 @@ div.message-htmlpart div.rcmBody
 {
   position: absolute;
   top: 90px;
-  left: 200px;
+  left: 190px;
   right: 25px;
   bottom: 30px;
   margin: 0px;
   /* css hack for IE */
-  width: expression((parseInt(document.documentElement.clientWidth)-220)+'px');
+  width: expression((parseInt(document.documentElement.clientWidth)-210)+'px');
   height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');
 }
 
diff --git a/skins/default/print.css b/skins/default/print.css
index fa9c38c7e..441a5de91 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -103,6 +103,8 @@ div.message-part a
   color: #0000CC;
 }
 
+div.message-part pre,
+div.message-htmlpart pre,
 div.message-part div.pre
 {
   margin: 0;
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 5c4bd56dc..6c984ab67 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -132,6 +132,14 @@ span.tablink-selected a
   background-color: #F9F9F9;
 }
 
+#subscription-table
+{
+  width: 100%;
+  /* css hack for IE */
+  width: expression('auto');
+}
+
+#subscription-table tbody td,
 #identities-table tbody td
 {
   cursor: default;
@@ -149,6 +157,45 @@ span.tablink-selected a
   width: 45%;
 }
 
+#subscription-table tr.virtual td
+{
+  color: #666;
+}
+
+#subscription-table tr.selected td,
+#subscription-table tr.selected td a
+{
+  color: #FFFFFF;
+  background-color: #CC3333;
+}
+
+#subscription-table tr.droptarget td,
+#subscription-table tr.droptarget td a
+{
+  background-color: #FFFFA6;
+}
+
+#subscription-table thead td.name
+{
+  width: 360px;
+}
+
+#subscription-table thead td.msgcount
+{
+  width: 90px;
+}
+
+#subscription-table thead td.subscribed
+{
+  width: 90px;
+}
+
+#subscription-table thead td.rename,
+#subscription-table thead td.delete
+{
+  width: 30px;
+}
+
 #identity-frame
 {
   position: relative;
@@ -194,8 +241,7 @@ input.disabled
 
 #userprefs-title,
 #identity-title,
-div.boxtitle,
-#subscription-table thead td
+div.boxtitle
 {
   height: 12px !important;
   padding: 4px 20px 3px 6px;
@@ -220,57 +266,6 @@ div.settingspart
   padding: 10px;
 }
 
-#subscription-table
-{
-  width: 100%;
-  /* css hack for IE */ 
-  width: expression('auto');
-}
-
-#subscription-table tbody td
-{
-  height: 20px;
-  padding-left: 6px;
-  padding-right: 10px;
-  white-space: nowrap;
-  border-bottom: 1px solid #EBEBEB;
-  background-color: #F9F9F9;
-  cursor: default;
-}
-
-#subscription-table tr.virtual td
-{
-  color: #666;
-}
-
-#subscription-table tr.selected td,
-#subscription-table tr.selected td a
-{
-  color: #FFFFFF;
-  background-color: #CC3333;
-}
-
-#subscription-table tr.droptarget td,
-#subscription-table tr.droptarget td a
-{
-  background-color: #FFFFA6;
-}
-
-#subscription-table thead td.name
-{
-  width: 250px;
-}
-
-#subscription-table thead td.msgcount
-{
-  width: 90px;
-}
-
-#subscription-table thead td.subscribed
-{
-  width: 90px;
-}
-
 fieldset 
 {
   margin-bottom: 0.5em;
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 326ded296..ce295567b 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -41,7 +41,7 @@
 </div>
 
 <div id="quicksearchbar">
-<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
+<roundcube:object name="searchform" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
 </div>
 
 <roundcube:if condition="config:ldap_public" />
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index fb887ba5e..96be0f65e 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -136,7 +136,7 @@
 </div>
 
 <div id="quicksearchbar">
-<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
+<roundcube:object name="searchform" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
 </div>
 
 </body>
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index 8808f5130..5da5c22f1 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -16,7 +16,7 @@
 
 <div id="folder-manager">
 <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
-  cellpadding="1" cellspacing="0" summary="Folder subscription table"
+  cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table"
   deleteIcon="/images/icons/folder-trash.png"
   renameIcon="/images/icons/rename.png" />
 </div>