Skip to content

Fix text colour in Merge dialogue #5521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 27, 2019
Merged

Fix text colour in Merge dialogue #5521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65829c8
Fix text colour in Merge dialogue
Oct 26, 2019
6b6ec2e
Update changelog
Oct 26, 2019
f15168f
Merge branch 'master' into fix_field_colour_in_merge_dialog
Oct 26, 2019
70f533f
Fix changelog to use American spelling
martinacat Oct 26, 2019
61ba5f9
Move CSS to Dark so that Light theme is not affected
martinacat Oct 26, 2019
aead6ec
Fix color of radio button in merge dialog
martinacat Oct 26, 2019
22d248e
Merge branch 'master' into fix_field_colour_in_merge_dialog
martinacat Oct 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +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 dialog showed the wrong text colour in "Dark" mode [#5516](https://github.com/JabRef/jabref/issues/5516)

### Removed

Expand Down
9 changes: 9 additions & 0 deletions src/main/java/org/jabref/gui/Dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,12 @@
background-color: #272b38; /* -fx-control-inner-background*/
color : #7d8591; /* -fx-mid-text-color*/
}

.text-unchanged {
-fx-fill: -fx-light-text-color;
}

.radio-button > .radio {
-fx-background-color: -fx-light-text-color, -fx-control-inner-background;
}

5 changes: 1 addition & 4 deletions src/main/java/org/jabref/gui/mergeentries/MergeEntries.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
-fx-fill: darkgreen;
}

.text-unchanged {

}

.text-added {
-fx-fill: blue;
}

.text-removed {
-fx-fill: red;
}