From 5f938254facf69729e49cc5596661075ae957b97 Mon Sep 17 00:00:00 2001
From: pictuga <generaleduweb@gmail.com>
Date: Thu, 11 Apr 2013 01:24:50 +0300
Subject: Use CSS3 ellipsis in .postTitle.

CSS3 property which makes cut-off text look smoother.
---
 tt-rss.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tt-rss.css')

diff --git a/tt-rss.css b/tt-rss.css
index 48a5aa596..ba017f1d6 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -41,6 +41,7 @@ div.postReply div.postHeader {
 
 div.postReply div.postTitle {
 	overflow : hidden;
+	text-overflow: ellipsis;
 	white-space : nowrap;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 2eee85448123824138ef3cc5ca56c9b20f016b79 Mon Sep 17 00:00:00 2001
From: Veit Lehmann <veit.lehmann@googlemail.com>
Date: Fri, 12 Apr 2013 23:19:43 +0300
Subject: don't distort resized images

If images have width/height attributes set and are reduced in size by max-width: auto, they look distorted. height: auto fixes this.
---
 tt-rss.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tt-rss.css')

diff --git a/tt-rss.css b/tt-rss.css
index ba017f1d6..c5dc6d8a0 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -57,6 +57,7 @@ div.postReply div.postContent {
 div.postReply div.postContent img {
 	border-width : 0px;
 	max-width : 98%;
+	height: auto;
 }
 
 div.postReply div.postEnclosures {
-- 
cgit v1.2.3-54-g00ecf


From a6e3554e32a8371cddb525c9ea092c4a9399b5a2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 13 Apr 2013 15:41:39 +0400
Subject: ttrssZoom: fix image width

---
 tt-rss.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tt-rss.css')

diff --git a/tt-rss.css b/tt-rss.css
index ba017f1d6..3dfe3bef7 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -999,6 +999,10 @@ body#ttrssZoom div.footer {
 	text-align : center;
 }
 
+body#ttrssZoom div.postContent img {
+	max-width : 650px;
+}
+
 select.attachments {
 	display : block;
 	margin-top : 10px;
-- 
cgit v1.2.3-54-g00ecf


From 542c563c55dac88213479fd1cb8a683cad981cd0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 13 Apr 2013 15:43:13 +0400
Subject: use height : auto in ttrssZoom

---
 tt-rss.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tt-rss.css')

diff --git a/tt-rss.css b/tt-rss.css
index b0f2efe6d..6067ca7d6 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1002,6 +1002,7 @@ body#ttrssZoom div.footer {
 
 body#ttrssZoom div.postContent img {
 	max-width : 650px;
+	height : auto;
 }
 
 select.attachments {
-- 
cgit v1.2.3-54-g00ecf


From e43a9c4a01bf095b740e35711c79f6a0ca3374ba Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 13:16:14 +0400
Subject: add a %d articles selected element

---
 classes/feeds.php |  1 +
 js/functions.js   |  6 ++++++
 js/viewfeed.js    | 24 ++++++++++++++++++++++++
 tt-rss.css        |  3 +++
 4 files changed, 34 insertions(+)

(limited to 'tt-rss.css')

diff --git a/classes/feeds.php b/classes/feeds.php
index 2f8dcb5ec..c7b7a83e6 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -49,6 +49,7 @@ class Feeds extends Handler_Protected {
 		// right part
 
 		$reply .= "<span class='r'>";
+		$reply .= "<span id='selected_prompt'></span>";
 		$reply .= "<span id='feed_title'>";
 
 		if ($feed_site_url) {
diff --git a/js/functions.js b/js/functions.js
index 07eed2ad9..9336433ca 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -368,6 +368,9 @@ function toggleSelectRow2(sender, row, is_cdm) {
 		row.addClassName('Selected');
 	else
 		row.removeClassName('Selected');
+
+	if (typeof updateSelectedPrompt != undefined)
+		updateSelectedPrompt();
 }
 
 
@@ -379,6 +382,9 @@ function toggleSelectRow(sender, row) {
 		row.addClassName('Selected');
 	else
 		row.removeClassName('Selected');
+
+	if (typeof updateSelectedPrompt != undefined)
+		updateSelectedPrompt();
 }
 
 function checkboxToggleElement(elem, id) {
diff --git a/js/viewfeed.js b/js/viewfeed.js
index da5ded64f..519ab3449 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -639,11 +639,33 @@ function toggleSelected(id, force_on) {
 				if (cb) cb.attr("checked", true);
 			}
 		}
+
+		updateSelectedPrompt();
 	} catch (e) {
 		exception_error("toggleSelected", e);
 	}
 }
 
+function updateSelectedPrompt() {
+	try {
+		var count = getSelectedArticleIds2().size();
+		var elem = $("selected_prompt");
+
+		if (elem) {
+			elem.innerHTML = ngettext("%d article selected",
+					"%d articles selected", count).replace("%d", count);
+
+			if (count > 0)
+				Element.show(elem);
+			else
+				Element.hide(elem);
+		}
+
+	} catch (e) {
+		exception_error("updateSelectedPrompt", e);
+	}
+}
+
 function toggleUnread_afh(effect) {
 	try {
 
@@ -960,6 +982,8 @@ function selectArticles(mode) {
 			}
 		});
 
+		updateSelectedPrompt();
+
 	} catch (e) {
 		exception_error("selectArticles", e);
 	}
diff --git a/tt-rss.css b/tt-rss.css
index 6067ca7d6..d2e854d8f 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1019,3 +1019,6 @@ div.hl.active a.title {
 	color : #4684ff;
 }
 
+#selected_prompt {
+	margin-right : 25px;
+}
-- 
cgit v1.2.3-54-g00ecf


From 95437e9e0756edacb835843074c12632c11a64b1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 10:50:46 +0400
Subject: tweak notify layout/display

---
 index.php       |  2 +-
 js/functions.js | 44 ++++++++++++++------------------------------
 prefs.php       |  2 +-
 tt-rss.css      | 27 +++++++++++++++++----------
 4 files changed, 33 insertions(+), 42 deletions(-)

(limited to 'tt-rss.css')

diff --git a/index.php b/index.php
index 2fa856631..066b25fa5 100644
--- a/index.php
+++ b/index.php
@@ -138,7 +138,7 @@
 	</div>
 </div>
 
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="notify" class="notify" style="display : none"></div>
 <div id="cmdline" style="display : none"></div>
 <div id="headlines-tmp" style="display : none"></div>
 
diff --git a/js/functions.js b/js/functions.js
index 9336433ca..e02767504 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1,8 +1,8 @@
-var notify_silent = false;
 var loading_progress = 0;
 var sanity_check_done = false;
 var init_params = {};
 var _label_base_index = -1024;
+var notify_hide_timerid = false;
 
 Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
 	function (callOriginal, options) {
@@ -147,42 +147,28 @@ function param_unescape(arg) {
 		return unescape(arg);
 }
 
-var notify_hide_timerid = false;
 
 function hide_notify() {
-	var n = $("notify");
-	if (n) {
-		n.style.display = "none";
-	}
-}
-
-function notify_silent_next() {
-	notify_silent = true;
+	Element.hide('notify');
 }
 
 function notify_real(msg, no_hide, n_type) {
 
-	if (notify_silent) {
-		notify_silent = false;
-		return;
-	}
-
 	var n = $("notify");
-	var nb = $("notify_body");
 
-	if (!n || !nb) return;
+	if (!n) return;
 
 	if (notify_hide_timerid) {
 		window.clearTimeout(notify_hide_timerid);
 	}
 
 	if (msg == "") {
-		if (n.style.display == "block") {
+		if (Element.visible(n)) {
 			notify_hide_timerid = window.setTimeout("hide_notify()", 0);
 		}
 		return;
 	} else {
-		n.style.display = "block";
+		Element.show(n);
 	}
 
 	/* types:
@@ -194,33 +180,31 @@ function notify_real(msg, no_hide, n_type) {
 
 	*/
 
-	msg = __(msg);
+	msg = "<span class=\"msg\"> " + __(msg) + "</span>";
 
 	if (n_type == 1) {
 		n.className = "notify";
 	} else if (n_type == 2) {
 		n.className = "notify progress";
-		msg = "<img src='images/indicator_white.gif'> " + msg;
+		msg = "<span><img src='images/indicator_white.gif'></span>" + msg;
+		no_hide = true;
 	} else if (n_type == 3) {
 		n.className = "notify error";
-		msg = "<img src='images/sign_excl.svg'> " + msg;
+		msg = "<span><img src='images/sign_excl.svg'></span>" + msg;
 	} else if (n_type == 4) {
 		n.className = "notify info";
-		msg = "<img src='images/sign_info.svg'> " + msg;
-	}
-
-	if (no_hide) {
-		msg += " <span>(<a href='#' onclick=\"notify('')\">" +
-			__("close") + "</a>)</span>";
+		msg = "<span><img src='images/sign_info.svg'></span>" + msg;
 	}
 
+	msg += " <span><img src=\"images/close_notify.svg\" class=\"close\" title=\"" +
+		__("Click to close") + "\" onclick=\"notify('')\"></span>";
 
 //	msg = "<img src='images/live_com_loading.gif'> " + msg;
 
-	nb.innerHTML = msg;
+	n.innerHTML = msg;
 
 	if (!no_hide) {
-		notify_hide_timerid = window.setTimeout("hide_notify()", 3000);
+		notify_hide_timerid = window.setTimeout("hide_notify()", 5*1000);
 	}
 }
 
diff --git a/prefs.php b/prefs.php
index a047931c6..e3b62da70 100644
--- a/prefs.php
+++ b/prefs.php
@@ -93,7 +93,7 @@
 
 <body id="ttrssPrefs" class="claro">
 
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="notify" class="notify" style="display : none"></div>
 <div id="cmdline" style="display : none"></div>
 
 <div id="overlay">
diff --git a/tt-rss.css b/tt-rss.css
index d2e854d8f..8e87d6598 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -132,14 +132,12 @@ a:hover {
 }
 
 #notify {
-	top : 25px;
+	bottom : 10px;
 	right : 10px;
 	border-width : 1px;
 	border-style : solid;
 	position : absolute;	
-	display : none;
-	float : right;
-	font-size : 11px;
+	font-size : 12px;
 	z-index : 99;
 	padding : 5px;
 	min-width : 200px;
@@ -148,7 +146,21 @@ a:hover {
 
 #notify img {
 	vertical-align : middle;
-	margin-right : 4px;
+	max-height : 14px;
+}
+
+#notify span.msg {
+	width : 100%;
+}
+
+#notify span.close {
+	text-align : right;
+}
+
+#notify span {
+	display : table-cell;
+	vertical-align : middle;
+	padding : 4px;
 }
 
 .notify {
@@ -171,11 +183,6 @@ a:hover {
 	border-color : #ff0000;
 }
 
-.notify.error span:hover {
-	color : red;
-	cursor : pointer;
-}
-
 .hl.Unread div.hlTitle {
 	font-weight : bold;
 }
-- 
cgit v1.2.3-54-g00ecf


From 6d9426feae3d80272722de2fda6ee9e0056569ca Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 16:18:20 +0400
Subject: tweak notice/warning/etc display

---
 include/functions.php | 6 +++---
 tt-rss.css            | 2 +-
 utility.css           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tt-rss.css')

diff --git a/include/functions.php b/include/functions.php
index 9f890eba7..e0c102b38 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2925,19 +2925,19 @@
 	function format_warning($msg, $id = "") {
 		global $link;
 		return "<div class=\"warning\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\"><div class='inner'>$msg</div></div>";
+			<img src=\"images/sign_excl.svg\">$msg</div>";
 	}
 
 	function format_notice($msg, $id = "") {
 		global $link;
 		return "<div class=\"notice\" id=\"$id\">
-			<img src=\"images/sign_info.svg\"><div class='inner'>$msg</div></div>";
+			<img src=\"images/sign_info.svg\">$msg</div>";
 	}
 
 	function format_error($msg, $id = "") {
 		global $link;
 		return "<div class=\"error\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\"><div class='inner'>$msg</div></div>";
+			<img src=\"images/sign_excl.svg\">$msg</div>";
 	}
 
 	function print_notice($msg) {
diff --git a/tt-rss.css b/tt-rss.css
index 8e87d6598..8bf591326 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -287,8 +287,8 @@ div.error {
 
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
-	float : left;
 	vertical-align : middle;
+	display : table-cell;
 }
 
 ul.nomarks {
diff --git a/utility.css b/utility.css
index 65dc20b1e..d4b6d0a02 100644
--- a/utility.css
+++ b/utility.css
@@ -73,7 +73,7 @@ div.error {
 
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
-	float : left;
+	display : table-cell;
 	vertical-align : middle;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 3c200461f81250f7e112149bf9b55245943b42c1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 22:27:05 +0400
Subject: more notice css tweaks

---
 classes/handler/public.php | 2 +-
 include/functions.php      | 6 +++---
 install/index.php          | 5 +++--
 tt-rss.css                 | 5 +++++
 utility.css                | 4 ++++
 5 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'tt-rss.css')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 79ed9d0ae..3b373edf5 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -929,7 +929,7 @@ class Handler_Public extends Handler {
 
 					} else {
 
-						print "<h2>" . "Tiny Tiny RSS database is up to date." . "</h2>";
+						print_notice("Tiny Tiny RSS database is up to date.");
 
 						print "<p><form method=\"GET\" action=\"index.php\">
 							<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
diff --git a/include/functions.php b/include/functions.php
index e0c102b38..0908bf8d3 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2925,19 +2925,19 @@
 	function format_warning($msg, $id = "") {
 		global $link;
 		return "<div class=\"warning\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\">$msg</div>";
+			<span><img src=\"images/sign_excl.svg\"></span><span>$msg</span></div>";
 	}
 
 	function format_notice($msg, $id = "") {
 		global $link;
 		return "<div class=\"notice\" id=\"$id\">
-			<img src=\"images/sign_info.svg\">$msg</div>";
+			<span><img src=\"images/sign_info.svg\"></span><span>$msg</span></div>";
 	}
 
 	function format_error($msg, $id = "") {
 		global $link;
 		return "<div class=\"error\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\">$msg</div>";
+			<span><img src=\"images/sign_excl.svg\"></span><span>$msg</span></div>";
 	}
 
 	function print_notice($msg) {
diff --git a/install/index.php b/install/index.php
index 9cbab20f1..416765e8f 100644
--- a/install/index.php
+++ b/install/index.php
@@ -80,12 +80,13 @@
 	}
 
 	function print_error($msg) {
-		print "<div class='error'><img src='../images/sign_excl.svg'> $msg</div>";
+		print "<div class='error'><span><img src='../images/sign_excl.svg'></span>
+			<span>$msg</span></div>";
 	}
 
 	function print_notice($msg) {
 		print "<div class=\"notice\">
-			<img src=\"../images/sign_info.svg\">$msg</div>";
+			<span><img src=\"../images/sign_info.svg\"></span><span>$msg</span></div>";
 	}
 
 	function db_connect($host, $user, $pass, $db, $type, $port) {
diff --git a/tt-rss.css b/tt-rss.css
index 8bf591326..454e2ffd1 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -288,7 +288,12 @@ div.error {
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
 	vertical-align : middle;
+}
+
+div.warning span, div.notice span, div.error span {
 	display : table-cell;
+	vertical-align : middle;
+
 }
 
 ul.nomarks {
diff --git a/utility.css b/utility.css
index d4b6d0a02..50a54e154 100644
--- a/utility.css
+++ b/utility.css
@@ -73,6 +73,10 @@ div.error {
 
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
+	vertical-align : middle;
+}
+
+div.warning span, div.notice span, div.error span {
 	display : table-cell;
 	vertical-align : middle;
 }
-- 
cgit v1.2.3-54-g00ecf


From 8d090a910b7e2d4d1b26e734c09eaa773b853804 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 4 May 2013 12:01:53 +0400
Subject: use css nth-child instead of old even/odd class hacks for normal mode

---
 classes/feeds.php      |  4 ++--
 classes/pref/feeds.php |  2 --
 classes/pref/prefs.php |  2 --
 classes/pref/users.php |  8 +-------
 js/viewfeed.js         | 25 -------------------------
 tt-rss.css             | 20 +++-----------------
 6 files changed, 6 insertions(+), 55 deletions(-)

(limited to 'tt-rss.css')

diff --git a/classes/feeds.php b/classes/feeds.php
index 1a1798151..f499fe9a6 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -288,8 +288,6 @@ class Feeds extends Handler_Protected {
 			$expand_cdm = get_pref('CDM_EXPANDED');
 
 			while ($line = $this->dbh->fetch_assoc($result)) {
-				$class = ($lnum % 2) ? "even" : "odd";
-
 				$id = $line["id"];
 				$feed_id = $line["feed_id"];
 				$label_cache = $line["label_cache"];
@@ -316,6 +314,8 @@ class Feeds extends Handler_Protected {
 					array_push($topmost_article_ids, $id);
 				}
 
+				$class = "";
+
 				if (sql_bool_to_bool($line["unread"])) {
 					$class .= " Unread";
 					++$num_unread;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index e31725111..ab280a98e 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1594,7 +1594,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
 			$feed_id = $line["id"];
 			$this_row_id = "id=\"FUPDD-$feed_id\"";
 
@@ -1664,7 +1663,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
 			$feed_id = $line["id"];
 			$this_row_id = "id=\"FERDD-$feed_id\"";
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 45715488a..ba83a9900 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1041,8 +1041,6 @@ class Pref_Prefs extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
-
 			$profile_id = $line["id"];
 			$this_row_id = "id=\"FCATR-$profile_id\"";
 
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 4b7d2d69a..d97362f9f 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -69,8 +69,6 @@ class Pref_Users extends Handler_Protected {
 
 			print "<ul class=\"userFeedList\">";
 
-			$row_class = "odd";
-
 			while ($line = $this->dbh->fetch_assoc($result)) {
 
 				$icon_file = ICONS_URL."/".$line["id"].".ico";
@@ -81,9 +79,7 @@ class Pref_Users extends Handler_Protected {
 					$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
 				}
 
-				print "<li class=\"$row_class\">$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
-
-				$row_class = $row_class == "even" ? "odd" : "even";
+				print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
 
 			}
 
@@ -408,8 +404,6 @@ class Pref_Users extends Handler_Protected {
 
 			while ($line = $this->dbh->fetch_assoc($result)) {
 
-				$class = ($lnum % 2) ? "even" : "odd";
-
 				$uid = $line["id"];
 
 				print "<tr id=\"UMRR-$uid\">";
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 3e78f4ca9..0e1e9cdba 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -134,8 +134,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 					if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
 
-					fixHeadlinesOrder(getLoadedArticleIds());
-
 					if (getInitParam("cdm_auto_catchup") == 1) {
 						c.domNode.appendChild(hsp);
 					}
@@ -1496,26 +1494,6 @@ function cdmExpandArticle(id, noexpand) {
 	return false;
 }
 
-function fixHeadlinesOrder(ids) {
-	try {
-		for (var i = 0; i < ids.length; i++) {
-			var e = $("RROW-" + ids[i]);
-
-			if (e) {
-				if (i % 2 == 0) {
-					e.removeClassName("even");
-					e.addClassName("odd");
-				} else {
-					e.removeClassName("odd");
-					e.addClassName("even");
-				}
-			}
-		}
-	} catch (e) {
-		exception_error("fixHeadlinesOrder", e);
-	}
-}
-
 function getArticleUnderPointer() {
 	return post_under_pointer;
 }
@@ -1596,7 +1574,6 @@ function dismissSelectedArticles() {
 		if (sel.length > 0)
 			selectionToggleUnread(false);
 
-		fixHeadlinesOrder(tmp);
 
 	} catch (e) {
 		exception_error("dismissSelectedArticles", e);
@@ -1621,8 +1598,6 @@ function dismissReadArticles() {
 			}
 		}
 
-		fixHeadlinesOrder(tmp);
-
 	} catch (e) {
 		exception_error("dismissSelectedArticles", e);
 	}
diff --git a/tt-rss.css b/tt-rss.css
index 454e2ffd1..6b4a10d7d 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -187,17 +187,12 @@ a:hover {
 	font-weight : bold;
 }
 
-.hl.even.Grayed {
-	background : #f0f0f0;
+.hl.Grayed {
 	color : #909090;
-	border-width : 0px 0px 1px 0px;
-	border-style : solid;
-	border-color : #c0c0c0;
-	border-collapse : collapse;
 }
 
-.hl.odd.Grayed {
-	color : #909090;
+#headlines-frame div.hl:nth-child(even) {
+	background : #f0f0f0;
 }
 
 .hl {
@@ -210,15 +205,6 @@ a:hover {
 	background : #ecf4ff ! important;
 }
 
-.hl.even {
-	background : #f0f0f0;
-	border-collapse : collapse;
-}
-
-.hl.odd {
-	background : white;
-}
-
 div.filterTestHolder {
 	height : 300px;
 	overflow : auto;
-- 
cgit v1.2.3-54-g00ecf


From 7d61f11c768869806a352ea94550220cc2c144c0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 08:55:22 +0400
Subject: use img-polaroid lookalike for images

---
 cdm.css    | 9 +++++++++
 tt-rss.css | 8 ++++++++
 2 files changed, 17 insertions(+)

(limited to 'tt-rss.css')

diff --git a/cdm.css b/cdm.css
index 657950140..fa4da413d 100644
--- a/cdm.css
+++ b/cdm.css
@@ -61,6 +61,15 @@ div.cdmContentInner img {
 	border-width : 0px;
 	max-width : 98%;
 	height : auto;
+
+	padding: 4px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+	-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+
 }
 
 div.cdmFooter {
diff --git a/tt-rss.css b/tt-rss.css
index 6b4a10d7d..5702c85f3 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -58,6 +58,14 @@ div.postReply div.postContent img {
 	border-width : 0px;
 	max-width : 98%;
 	height: auto;
+
+	padding: 4px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+	-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 }
 
 div.postReply div.postEnclosures {
-- 
cgit v1.2.3-54-g00ecf


From 2cf3500e1d16a2c3bcddfc275c600e32dbac7152 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 09:44:34 +0400
Subject: attempt to fix annoying shifting of feedTree elements while hover
 changes

---
 tt-rss.css | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'tt-rss.css')

diff --git a/tt-rss.css b/tt-rss.css
index 5702c85f3..ecd386145 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -787,10 +787,6 @@ div.fatalError textarea {
 	border-width : 0px;
 }
 
-#feedTree {
-	overflow : visible;
-}
-
 #headlines-frame {
 	padding : 0px;
 	border-color : #88b0f0;
@@ -1028,3 +1024,14 @@ div.hl.active a.title {
 #selected_prompt {
 	margin-right : 25px;
 }
+
+#feedTree .dijitTreeRow, #feedTree .dijitTreeNode, #feedTree .dijitFocused {
+	padding : 1px 0px 1px;
+	border-width : 1px;
+	border-color : transparent;
+}
+
+#feedTree { 
+	height : 100%;
+	overflow-x : hidden;
+}
-- 
cgit v1.2.3-54-g00ecf


From 05aab603769e2f53edb0963cad99b444d2d901ee Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 09:58:58 +0400
Subject: remove some blue borders

---
 tt-rss.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tt-rss.css')

diff --git a/tt-rss.css b/tt-rss.css
index ecd386145..0d43aa79e 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -774,7 +774,7 @@ div.fatalError textarea {
 
 #feeds-holder {
 	padding : 0px;
-	border-color : #88b0f0;
+	border-color : #c0c0c0;
 	border-left-width : 0px;
 	border-bottom-width : 0px;
 	border-top-width : 0px;
@@ -789,7 +789,7 @@ div.fatalError textarea {
 
 #headlines-frame {
 	padding : 0px;
-	border-color : #88b0f0;
+	border-color : #c0c0c0;
 	border-left-width : 0px;
 	border-right-width : 0px;
 	margin-top : 0px;
@@ -829,7 +829,7 @@ div.fatalError textarea {
 
 #content-insert {
 	padding : 0px;
-	border-color : #88b0f0;
+	border-color : #c0c0c0;
 	border-bottom-width : 0px;
 	border-right-width : 0px;
 	border-left-width : 0px;
-- 
cgit v1.2.3-54-g00ecf


From 7c433c9412cf0f5a0d582aacd1bed9a1660c866c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 10:02:22 +0400
Subject: Revert "use img-polaroid lookalike for images"

This reverts commit 7d61f11c768869806a352ea94550220cc2c144c0.
---
 cdm.css    | 9 ---------
 tt-rss.css | 8 --------
 2 files changed, 17 deletions(-)

(limited to 'tt-rss.css')

diff --git a/cdm.css b/cdm.css
index fa4da413d..657950140 100644
--- a/cdm.css
+++ b/cdm.css
@@ -61,15 +61,6 @@ div.cdmContentInner img {
 	border-width : 0px;
 	max-width : 98%;
 	height : auto;
-
-	padding: 4px;
-	background-color: #fff;
-	border: 1px solid #ccc;
-	border: 1px solid rgba(0, 0, 0, 0.2);
-	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-	-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-
 }
 
 div.cdmFooter {
diff --git a/tt-rss.css b/tt-rss.css
index 0d43aa79e..b5cf4d2a2 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -58,14 +58,6 @@ div.postReply div.postContent img {
 	border-width : 0px;
 	max-width : 98%;
 	height: auto;
-
-	padding: 4px;
-	background-color: #fff;
-	border: 1px solid #ccc;
-	border: 1px solid rgba(0, 0, 0, 0.2);
-	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-	-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 }
 
 div.postReply div.postEnclosures {
-- 
cgit v1.2.3-54-g00ecf


From 75933cf00d4331fd27821af03cadbb2e7c83da79 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 12:14:11 +0400
Subject: better fix for feedTree shifting

---
 tt-rss.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tt-rss.css')

diff --git a/tt-rss.css b/tt-rss.css
index b5cf4d2a2..09a3505af 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1017,12 +1017,17 @@ div.hl.active a.title {
 	margin-right : 25px;
 }
 
-#feedTree .dijitTreeRow, #feedTree .dijitTreeNode, #feedTree .dijitFocused {
+#feedTree .dijitTreeRow, #feedTree .dijitFocused {
 	padding : 1px 0px 1px;
 	border-width : 1px;
 	border-color : transparent;
 }
 
+#feedTree .dijitTreeNode {
+	padding : 0px;
+	border-width : 0px;
+}
+
 #feedTree { 
 	height : 100%;
 	overflow-x : hidden;
-- 
cgit v1.2.3-54-g00ecf