From 409d05eec8997c536763923d817db777da8d7fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <f@miniflux.net>
Date: Wed, 2 Jun 2021 18:54:28 -0700
Subject: [PATCH] Feeds with errors should appear before unread ones

---
 storage/feed.go          |  6 +++++-
 ui/static/css/common.css |  3 ++-
 ui/static/css/dark.css   |  7 +++++--
 ui/static/css/light.css  |  7 +++++--
 ui/static/css/system.css | 14 ++++++++++----
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/storage/feed.go b/storage/feed.go
index c1c71097..ae0fb1b4 100644
--- a/storage/feed.go
+++ b/storage/feed.go
@@ -21,7 +21,11 @@ type byStateAndName struct{ f model.Feeds }
 func (l byStateAndName) Len() int      { return len(l.f) }
 func (l byStateAndName) Swap(i, j int) { l.f[i], l.f[j] = l.f[j], l.f[i] }
 func (l byStateAndName) Less(i, j int) bool {
-	if l.f[i].UnreadCount > 0 && l.f[j].UnreadCount == 0 {
+	if l.f[i].ParsingErrorCount > 0 && l.f[j].ParsingErrorCount == 0 {
+		return true
+	} else if l.f[i].ParsingErrorCount == 0 && l.f[j].ParsingErrorCount > 0 {
+		return false
+	} else if l.f[i].UnreadCount > 0 && l.f[j].UnreadCount == 0 {
 		return true
 	} else if l.f[i].UnreadCount == 0 && l.f[j].UnreadCount > 0 {
 		return false
diff --git a/ui/static/css/common.css b/ui/static/css/common.css
index 2a186773..a8bbaae1 100644
--- a/ui/static/css/common.css
+++ b/ui/static/css/common.css
@@ -746,7 +746,8 @@ a.button {
 /* Feeds list */
 article.feed-parsing-error {
     background-color: var(--feed-parsing-error-background-color);
-    border-color: #aaa;
+    border-style: var(--feed-parsing-error-border-style);
+    border-color: var(--feed-parsing-error-border-color);
 }
 
 article.feed-has-unread {
diff --git a/ui/static/css/dark.css b/ui/static/css/dark.css
index 016e02cd..b83e8d1b 100644
--- a/ui/static/css/dark.css
+++ b/ui/static/css/dark.css
@@ -100,10 +100,13 @@
     --entry-enclosure-border-color: #333;
 
     --parsing-error-color: #eee;
-    --feed-parsing-error-background-color: #343434;
+    --feed-parsing-error-background-color: #3a1515;
+    --feed-parsing-error-border-style: solid;
+    --feed-parsing-error-border-color: #562222;
+
     --feed-has-unread-background-color: #1b1a1a;
     --feed-has-unread-border-style: solid;
-    --feed-has-unread-border-color: rgba(82, 168, 236, 0.6);
+    --feed-has-unread-border-color: rgb(33 57 76);
 
     --keyboard-shortcuts-li-color: #9b9b9b;
 
diff --git a/ui/static/css/light.css b/ui/static/css/light.css
index 1a4404fa..831b1eed 100644
--- a/ui/static/css/light.css
+++ b/ui/static/css/light.css
@@ -101,9 +101,12 @@
 
     --parsing-error-color: #333;
     --feed-parsing-error-background-color: #fcf8e3;
+    --feed-parsing-error-border-style: solid;
+    --feed-parsing-error-border-color: #f9e883;
+
     --feed-has-unread-background-color: #dfd;
-    --feed-has-unread-border-style: dotted;
-    --feed-has-unread-border-color: var(--entry-header-border-color);
+    --feed-has-unread-border-style: solid;
+    --feed-has-unread-border-color: #bee6bc;
 
     --keyboard-shortcuts-li-color: #333;
 
diff --git a/ui/static/css/system.css b/ui/static/css/system.css
index 1a7d1c2e..c9f99a1e 100644
--- a/ui/static/css/system.css
+++ b/ui/static/css/system.css
@@ -100,9 +100,12 @@
 
     --parsing-error-color: #333;
     --feed-parsing-error-background-color: #fcf8e3;
+    --feed-parsing-error-border-style: solid;
+    --feed-parsing-error-border-color: #f9e883;
+
     --feed-has-unread-background-color: #dfd;
-    --feed-has-unread-border-style: dotted;
-    --feed-has-unread-border-color: var(--entry-header-border-color);
+    --feed-has-unread-border-style: solid;
+    --feed-has-unread-border-color: #bee6bc;
 
     --keyboard-shortcuts-li-color: #333;
 
@@ -210,10 +213,13 @@
         --entry-enclosure-border-color: #333;
 
         --parsing-error-color: #eee;
-        --feed-parsing-error-background-color: #343434;
+        --feed-parsing-error-background-color: #3a1515;
+        --feed-parsing-error-border-style: solid;
+        --feed-parsing-error-border-color: #562222;
+
         --feed-has-unread-background-color: #1b1a1a;
         --feed-has-unread-border-style: solid;
-        --feed-has-unread-border-color: rgba(82, 168, 236, 0.6);
+        --feed-has-unread-border-color: rgb(33 57 76);
 
         --keyboard-shortcuts-li-color: #9b9b9b;