Parcourir la source

Feeds with errors should appear before unread ones

Frédéric Guillot il y a 4 ans
Parent
commit
409d05eec8
5 fichiers modifiés avec 27 ajouts et 10 suppressions
  1. 5 1
      storage/feed.go
  2. 2 1
      ui/static/css/common.css
  3. 5 2
      ui/static/css/dark.css
  4. 5 2
      ui/static/css/light.css
  5. 10 4
      ui/static/css/system.css

+ 5 - 1
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

+ 2 - 1
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 {

+ 5 - 2
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;
 

+ 5 - 2
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;
 

+ 10 - 4
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;