From 878a2f2f82e66918d55070af2f099a10978af319 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Aug 2024 19:05:03 +0200 Subject: [PATCH] Fix row coloring (again) --- src/main/java/org/jabref/gui/Base.css | 14 +++++++------- src/main/java/org/jabref/gui/Dark.css | 8 ++++---- .../java/org/jabref/gui/maintable/MainTable.css | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css index ad0e867d5de..662629ec718 100644 --- a/src/main/java/org/jabref/gui/Base.css +++ b/src/main/java/org/jabref/gui/Base.css @@ -262,20 +262,20 @@ /* region: maintable base colors **/ - -jr-match-1: -jr-row-odd-background; + -jr-match-1-odd: -jr-row-odd-background; -jr-match-1-even: -jr-row-even-background; -jr-match-1-text-color: -fx-mid-text-color; - -jr-match-2: derive(-jr-theme, 100%); - -jr-match-2-even: derive(-jr-match-2, 10%); + -jr-match-2-odd: derive(-jr-theme, 100%); + -jr-match-2-even: derive(-jr-match-2-odd, 10%); -jr-match-2-text-color: -fx-mid-text-color; - -jr-match-3: derive(-jr-theme, 50%); - -jr-match-3-even: derive(-jr-match-3, 10%); + -jr-match-3-odd: derive(-jr-theme, 50%); + -jr-match-3-even: derive(-jr-match-3-odd, 10%); -jr-match-3-text-color: derive(-jr-accent, 30%); - -jr-match-4: -jr-theme; - -jr-match-4-even: derive(-jr-match-4, 10%); + -jr-match-4-odd: -jr-theme; + -jr-match-4-even: derive(-jr-match-4-odd, 10%); -jr-match-4-text-color: -jr-accent; -jr-maintable-focused-hover-text: -jr-white; diff --git a/src/main/java/org/jabref/gui/Dark.css b/src/main/java/org/jabref/gui/Dark.css index 0e5aecf4d61..06bec9e65e7 100644 --- a/src/main/java/org/jabref/gui/Dark.css +++ b/src/main/java/org/jabref/gui/Dark.css @@ -62,19 +62,19 @@ -js-summary-text-color: derive(-fx-light-text-color, 70%); -js-summary-text-color-selected: derive( -fx-dark-text-color, 70%); - -jr-match-1: -jr-row-odd-background; + -jr-match-1-odd: -jr-row-odd-background; -jr-match-1-even: -jr-row-even-background; -jr-match-1-text-color: -fx-mid-text-color; - -jr-match-2: derive(-jr-theme, -60%); + -jr-match-2-odd: derive(-jr-theme, -60%); -jr-match-2-even: derive(-jr-match-2, 4%); -jr-match-2-text-color: -fx-mid-text-color; - -jr-match-3: derive(-jr-theme, -70%); + -jr-match-3-odd: derive(-jr-theme, -70%); -jr-match-3-even: derive(-jr-match-3, 4%); -jr-match-3-text-color: derive(-jr-accent, 30%); - -jr-match-4: derive(-jr-black, 10%); + -jr-match-4-odd: derive(-jr-black, 10%); -jr-match-4-even: -jr-background-alt; -jr-match-4-text-color: derive(-jr-match-3-text-color, -15%); } diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.css b/src/main/java/org/jabref/gui/maintable/MainTable.css index 31fb65ce21b..f468033b854 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTable.css +++ b/src/main/java/org/jabref/gui/maintable/MainTable.css @@ -40,7 +40,7 @@ /** even and odd are swapped around somehow. Below "odd" matches lines 2, 4, ... **/ .table-row-cell:matching-search-and-groups { - -fx-background-color: -jr-match-1; + -fx-background-color: -jr-match-1-even; } .table-row-cell:matching-search-and-groups > .table-cell { -fx-text-fill: -jr-match-1-text-color; @@ -64,7 +64,7 @@ -fx-icon-color: -jr-hover-text; } .table-row-cell:matching-search-and-groups:odd { - -fx-background-color: -jr-match-1-even; + -fx-background-color: -jr-match-1-odd; } .table-row-cell:matching-search-and-groups:odd:selected, .table-row-cell:matching-search-and-groups:odd:focused, @@ -77,7 +77,7 @@ } .table-row-cell:matching-search-not-groups { - -fx-background-color: -jr-match-2; + -fx-background-color: -jr-match-2-even; } .table-row-cell:matching-search-not-groups > .table-cell { -fx-text-fill: -jr-match-2-text-color; @@ -101,7 +101,7 @@ -fx-icon-color: -jr-hover-text; } .table-row-cell:matching-search-not-groups:odd { - -fx-background-color: -jr-match-2-even; + -fx-background-color: -jr-match-2-odd; } .table-row-cell:matching-search-not-groups:odd:selected, .table-row-cell:matching-search-not-groups:odd:focused, @@ -114,7 +114,7 @@ } .table-row-cell:matching-groups-not-search { - -fx-background-color: -jr-match-3; + -fx-background-color: -jr-match-3-even; } .table-row-cell:matching-groups-not-search > .table-cell { -fx-text-fill: -jr-match-3-text-color; @@ -138,7 +138,7 @@ -fx-icon-color: -jr-hover-text; } .table-row-cell:matching-groups-not-search:odd { - -fx-background-color: -jr-match-3-even; + -fx-background-color: -jr-match-3-odd; } .table-row-cell:matching-groups-not-search:odd:selected, .table-row-cell:matching-groups-not-search:odd:focused, @@ -151,7 +151,7 @@ } .table-row-cell:not-matching-search-and-groups { - -fx-background-color: -jr-match-4; + -fx-background-color: -jr-match-4-even; } .table-row-cell:not-matching-search-and-groups > .table-cell { -fx-text-fill: -jr-match-4-text-color; @@ -175,7 +175,7 @@ -fx-icon-color: -jr-hover-text; } .table-row-cell:not-matching-search-and-groups:odd { - -fx-background-color: -jr-match-4-even; + -fx-background-color: -jr-match-4-odd; } .table-row-cell:not-matching-search-and-groups:odd:selected, .table-row-cell:not-matching-search-and-groups:odd:focused,