Skip to content

Commit

Permalink
Fix text colour in Merge dialogue (#5521)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
martinacat authored and tobiasdiez committed Oct 27, 2019
1 parent b9dd815 commit 9d208fa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
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
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;
}

0 comments on commit 9d208fa

Please sign in to comment.