Skip to content

Commit 9d208fa

Browse files
martinacattobiasdiez
authored andcommitted
Fix text colour in Merge dialogue (#5521)
* Fix text colour in Merge dialogue fixes: #5516 * Update changelog fixes: #5516 * Fix changelog to use American spelling Code review change * Move CSS to Dark so that Light theme is not affected * Fix color of radio button in merge dialog
1 parent b9dd815 commit 9d208fa

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
5353
- 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)
5454
- We fixed an exception which occurred when an invalid jstyle was loaded. [#5452](https://github.com/JabRef/jabref/issues/5452)
5555
- We fixed an error where the preview theme did not adapt to the "Dark" mode [#5463](https://github.com/JabRef/jabref/issues/5463)
56+
- We fixed an issue where the merge dialog showed the wrong text colour in "Dark" mode [#5516](https://github.com/JabRef/jabref/issues/5516)
5657

5758
### Removed
5859

src/main/java/org/jabref/gui/Dark.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,12 @@
5555
background-color: #272b38; /* -fx-control-inner-background*/
5656
color : #7d8591; /* -fx-mid-text-color*/
5757
}
58+
59+
.text-unchanged {
60+
-fx-fill: -fx-light-text-color;
61+
}
62+
63+
.radio-button > .radio {
64+
-fx-background-color: -fx-light-text-color, -fx-control-inner-background;
65+
}
66+

src/main/java/org/jabref/gui/mergeentries/MergeEntries.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
-fx-fill: darkgreen;
33
}
44

5-
.text-unchanged {
6-
7-
}
8-
95
.text-added {
106
-fx-fill: blue;
117
}
128

139
.text-removed {
1410
-fx-fill: red;
1511
}
12+

0 commit comments

Comments
 (0)