From 65829c8e7df253d035fe373e514f11d116bd6253 Mon Sep 17 00:00:00 2001 From: Martina Catizone Date: Sat, 26 Oct 2019 10:40:25 +0100 Subject: [PATCH 1/5] Fix text colour in Merge dialogue fixes: #5516 --- src/main/java/org/jabref/gui/mergeentries/MergeEntries.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css index 9c110d24857..26ff923ebc1 100644 --- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css +++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css @@ -3,7 +3,7 @@ } .text-unchanged { - + -fx-fill: -fx-light-text-color; } .text-added { From 6b6ec2ecc7e2a6f0f2235d15181988a79b6cee70 Mon Sep 17 00:00:00 2001 From: Martina Catizone Date: Sat, 26 Oct 2019 10:46:49 +0100 Subject: [PATCH 2/5] Update changelog fixes: #5516 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4020b39cc62..24ab9ead476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - After successful import of one or multiple bib entries the main table scrolls to the first imported entry [#5383](https://github.com/JabRef/jabref/issues/5383) - We fixed an exception which occurred when an invalid jstyle was loaded. [#5452](https://github.com/JabRef/jabref/issues/5452) - We fixed an error where the preview theme did not adapt to the "Dark" mode [#5463](https://github.com/JabRef/jabref/issues/5463) +- We fixed an issue where the merge dialogue showed the wrong text colour in "Dark" mode [#5516](https://github.com/JabRef/jabref/issues/5516) ### Removed From 70f533f39abf25a5a84b8d48b1f44268024aa5d4 Mon Sep 17 00:00:00 2001 From: Martina Catizone Date: Sat, 26 Oct 2019 18:52:09 +0100 Subject: [PATCH 3/5] Fix changelog to use American spelling Code review change --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23ff0445b7c..01b38807d7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,7 +53,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - After successful import of one or multiple bib entries the main table scrolls to the first imported entry [#5383](https://github.com/JabRef/jabref/issues/5383) - We fixed an exception which occurred when an invalid jstyle was loaded. [#5452](https://github.com/JabRef/jabref/issues/5452) - We fixed an error where the preview theme did not adapt to the "Dark" mode [#5463](https://github.com/JabRef/jabref/issues/5463) -- We fixed an issue where the merge dialogue showed the wrong text colour in "Dark" mode [#5516](https://github.com/JabRef/jabref/issues/5516) +- We fixed an issue where the merge dialog showed the wrong text colour in "Dark" mode [#5516](https://github.com/JabRef/jabref/issues/5516) ### Removed From 61ba5f9e3ec21ea98b3ec410c140da8f51d572bf Mon Sep 17 00:00:00 2001 From: Martina Catizone Date: Sat, 26 Oct 2019 19:34:34 +0100 Subject: [PATCH 4/5] Move CSS to Dark so that Light theme is not affected --- src/main/java/org/jabref/gui/Dark.css | 4 ++++ src/main/java/org/jabref/gui/mergeentries/MergeEntries.css | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jabref/gui/Dark.css b/src/main/java/org/jabref/gui/Dark.css index b9ec0058a23..29a97f16f77 100644 --- a/src/main/java/org/jabref/gui/Dark.css +++ b/src/main/java/org/jabref/gui/Dark.css @@ -55,3 +55,7 @@ background-color: #272b38; /* -fx-control-inner-background*/ color : #7d8591; /* -fx-mid-text-color*/ } + +.text-unchanged { + -fx-fill: -fx-light-text-color; +} diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css index 26ff923ebc1..4481810193c 100644 --- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css +++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css @@ -2,10 +2,6 @@ -fx-fill: darkgreen; } -.text-unchanged { - -fx-fill: -fx-light-text-color; -} - .text-added { -fx-fill: blue; } @@ -13,3 +9,4 @@ .text-removed { -fx-fill: red; } + From aead6ec479186e814b42b5cbc7b08ec5332632c1 Mon Sep 17 00:00:00 2001 From: Martina Catizone Date: Sun, 27 Oct 2019 00:52:45 +0100 Subject: [PATCH 5/5] Fix color of radio button in merge dialog --- src/main/java/org/jabref/gui/Dark.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/jabref/gui/Dark.css b/src/main/java/org/jabref/gui/Dark.css index 29a97f16f77..cde1709d0ea 100644 --- a/src/main/java/org/jabref/gui/Dark.css +++ b/src/main/java/org/jabref/gui/Dark.css @@ -59,3 +59,8 @@ .text-unchanged { -fx-fill: -fx-light-text-color; } + +.radio-button > .radio { + -fx-background-color: -fx-light-text-color, -fx-control-inner-background; +} +