move preferences button to toolbar

3 files changed, 15 insertions, 27 deletions

diff --git a/tt-rss.css b/tt-rss.css
index 388b2e44b..b64860969 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -29,7 +29,7 @@ table.main td.prefsToolbar {
 	border-width : 0px 0px 0px 0px;
 	border-style : solid;
 	border-color : #c0c0c0;
-	padding : 3px 25px 15px 10px;
+	padding : 0px 10px 10px 5px;
 }
 
 table.main td.feeds {
diff --git a/tt-rss.php b/tt-rss.php
index 7dbe92236..b555179de 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -47,27 +47,6 @@
 </tr>
 <? } ?>
 <tr>
-	<td class="mainToolbar" colspan="2">
-	
-		<table width='100%' cellspacing='0' cellpadding='0'>	
-			<td><!-- <span id="notify"><span id="notify_body"></span> --></td>
-			<td align='right'>
-				<input type="submit" onclick="gotoPreferences()" 
-					class="button" value="Preferences"></td>
-		</table>
-	
-		<!-- <table width="100%" cellspacing="0" cellpadding="0">
-		<td valign="middle">
-			<table id="notify"><tr><td width="100%" id="notify_body">&nbsp;</td>
-			<td><img onclick="javascript:notify('')" alt="Close" 
-				src="images/close.png"></td></table>
-		</td>
-		<td class="toolbar" valign="middle" align="right">
-			<a href="prefs.php" class="button">Preferences</a></td>
-		</tr></table> -->
-	</td>
-</tr>
-<tr>
 	<td valign="top" rowspan="3" class="feeds"> 
 		
 		<!-- <div id="feeds">&nbsp;</div> -->
@@ -128,7 +107,12 @@
 		<input class="button" type="submit"
 			onclick="javascript:viewCurrentFeed(0, 'MarkAllRead')" value="Mark as read">
 
-		</td></tr>
+		</td>
+		<td align="right">
+			<input type="submit" onclick="gotoPreferences()" 
+				class="button" value="Preferences"></td>
+		</td>
+		</tr>
 		</table>
 	</td> 
 </tr><tr>
diff --git a/tt-rss_compact.css b/tt-rss_compact.css
index c8507da5f..e42552174 100644
--- a/tt-rss_compact.css
+++ b/tt-rss_compact.css
@@ -233,14 +233,18 @@ a:hover {
 }
 
 #notify {
-	font-weight : bold;
 	font-size : 10pt;
-	display : none;
-	width : 350px;
+	text-align : right;
 	color : gray;
-	font-size:8pt;
+	border-style : solid;
+	border-width : 0px 0px 1px 1px;
+	border-color : #c0c0c0;
+	background-color : white;
+	padding : 3px;
+	width : 350px;
 }
 
+
 #dispSwitch {
 	text-align : right;
 	padding : 5px 5px 5px 0px;