misc combined mode layout fixes

diff --git a/tt-rss.css b/tt-rss.css
index f683d85bec446e63d354cd068d1566e80130fe31..9f0b85874f6045d6fa5aacaca8adbb9135f8743d 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -79,7 +79,7 @@ table.main td.headlines {
 
 table.main td.headlines2 {
        height : 100%;
-       border-width : 0px 0px 1px 1px;
+       border-width : 0px 0px 0px 1px;
        border-style : solid;
        border-color : #c0c0c0;
 }

diff --git a/tt-rss.php b/tt-rss.php
index 13c2b17c5ff012558271b304efd96b776ada3ede..069293590f4748c8eb3ca7836d78cc085bce0ea9 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -79,7 +79,11 @@
 </td></tr>
 <? } ?>
 <tr>
-       <td valign="top" rowspan="3" class="feeds"> 
+       <? if (get_pref($link, 'COMBINED_DISPLAY_MODE')) 
+                       $feeds_rowspan = 2;
+               else 
+                       $feeds_rowspan = 3; ?>
+       <td valign="top" rowspan="<?= $feeds_rowspan ?>" class="feeds"> 
                <table class="innerFeedTable" 
                        cellspacing="0" cellpadding="0" height="100%" width="100%">
                <tr><td>