From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Tue, 13 Dec 2005 06:54:36 +0000 (+0100)
Subject: misc combined mode layout fixes
X-Git-Tag: schema_freeze_for_1.1.1~54
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=06300301c043378e18d27e2f43b0bdb0d32ca9a4;p=tt-rss.git

misc combined mode layout fixes
---

diff --git a/tt-rss.css b/tt-rss.css
index f683d85b..9f0b8587 100644
--- 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 13c2b17c..06929359 100644
--- 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>