Merge branch 'dev' into beta

Conflicts:
	README.md

1 files changed, 6 insertions, 5 deletions

diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 4ae3e98e9..fcfbb1424 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -492,10 +492,6 @@ a.btn {
 .categories .feeds .item.active {
 	background: #2980b9;
 }
-.categories .feeds .item.active .feed,
-.categories .feeds .item.empty.active .feed {
-	color: #fff;
-}
 .categories .feeds .item.empty.active {
 	background: #f39c12;
 }
@@ -508,6 +504,11 @@ a.btn {
 .categories .feeds .item.error .feed {
 	color: #bd362f;
 }
+.categories .feeds .item.active .feed,
+.categories .feeds .item.empty.active .feed,
+.categories .feeds .item.error.active .feed {
+	color: #fff;
+}
 .categories .feeds .item .feed {
 	margin: 0;
 	width: 165px;
@@ -551,7 +552,7 @@ a.btn {
 }
 .prompt form {
 	margin: 10px auto 20px auto;
-	width: 180px;
+	width: 200px;
 }
 .prompt input {
 	margin: 5px auto;