Merge branch 'dev' into beta

Conflicts:
	README.md

2 files changed, 10 insertions, 5 deletions

diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index c45b1812e..76ac37933 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -390,16 +390,18 @@ a.btn {
 /*=== Aside main page (feeds) */
 .categories .feeds .item.active {
 }
-.categories .feeds .item.active .feed {
-}
-.categories .feeds .item.empty .feed {
-}
 .categories .feeds .item.empty.active {
 }
-.categories .feeds .item.empty.active .feed {
+.categories .feeds .item.error.active {
+}
+.categories .feeds .item.empty .feed {
 }
 .categories .feeds .item.error .feed {
 }
+.categories .feeds .item.active .feed,
+.categories .feeds .item.empty.active .feed,
+.categories .feeds .item.error.active .feed {
+}
 .categories .feeds .item .feed {
 	margin: 0;
 	width: 165px;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 09ecaf685..466ec4603 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -309,6 +309,9 @@ a.btn {
 	list-style: none;
 	margin: 0;
 }
+.state_unread li:not(.active)[data-unread="0"] {
+	display: none;
+}
 .category {
 	display: block;
 	overflow: hidden;