From 1e2ace71cd1aa2df0e2df70a47b507fc36411f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=A9ndez?= Date: Thu, 23 May 2019 03:23:20 +0200 Subject: [PATCH 1/4] Fix background color of dialogs in dark mode --- src/main/java/org/jabref/gui/Base.css | 4 ++++ src/main/java/org/jabref/gui/help/AboutDialog.css | 5 +++-- .../java/org/jabref/gui/preferences/PreferencesDialog.css | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css index 642fe8dcf88..58b41e4d72d 100644 --- a/src/main/java/org/jabref/gui/Base.css +++ b/src/main/java/org/jabref/gui/Base.css @@ -1032,3 +1032,7 @@ We want to have a look that matches our icons in the tool-bar */ -fx-font-size: 1.5em; -fx-padding: 1em 0em 1em 0em; } + +.dialog-pane { + -fx-background-color: -fx-control-inner-background; +} \ No newline at end of file diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.css b/src/main/java/org/jabref/gui/help/AboutDialog.css index 8406e6c9ddf..9793ab8df1e 100644 --- a/src/main/java/org/jabref/gui/help/AboutDialog.css +++ b/src/main/java/org/jabref/gui/help/AboutDialog.css @@ -1,9 +1,10 @@ .about-heading { -fx-font-size: 30; + -fx-text-fill: -jr-theme; } .about-heading:pressed { - -fx-text-fill: -fx-focus-color; + -fx-text-fill: -jr-selected; } .top-padding { @@ -33,7 +34,7 @@ } .info-sections { - -fx-padding: 5px; + -fx-padding: 5px; } .logo-pane { diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css index d65cfddeed0..8933d9096a3 100644 --- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css +++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css @@ -1,12 +1,12 @@ #sideMenu { - -fx-background-color: -jr-white; + -fx-background-color: -fx-control-inner-background; -fx-border-color: -fx-outer-border; -fx-border-width: 1; } #sideMenu > .virtual-flow > .clipped-container > .sheet > .list-cell { -fx-padding: 8 8 8 8; - -fx-background: -jr-white; + -fx-background: -fx-control-inner-background; } .preferencePaneContainer { From 13a313a5c93e431a5c0fb3ba0cac815b4091c74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=A9ndez?= Date: Thu, 23 May 2019 03:29:35 +0200 Subject: [PATCH 2/4] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b2f1b66664..abd993e8d72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,6 +118,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We fixed an issue where a database exception related to a missing timezone was too big. [#4827](https://github.com/JabRef/jabref/issues/4827) - We fixed an issue where the command line help text had several errors, and arguments and descriptions have been rewritten to simplify and detail them better. [#4932](https://github.com/JabRef/jabref/issues/2016) - We fixed an issue where the same menu for changing entry type had two different sizes and weights. [#4977](https://github.com/JabRef/jabref/issues/4977) +- We fixed an issue where the background color of all dialogs in the dark theme was the same as in the light one. [#4987](https://github.com/JabRef/jabref/issues/4987) ### Removed From f6108e5e14cf46ae38d2de39cd590ccdc6d9b367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=A9ndez?= Date: Thu, 23 May 2019 03:33:35 +0200 Subject: [PATCH 3/4] Add new line at end of Base.css --- src/main/java/org/jabref/gui/Base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css index 58b41e4d72d..2db5a049c00 100644 --- a/src/main/java/org/jabref/gui/Base.css +++ b/src/main/java/org/jabref/gui/Base.css @@ -1035,4 +1035,4 @@ We want to have a look that matches our icons in the tool-bar */ .dialog-pane { -fx-background-color: -fx-control-inner-background; -} \ No newline at end of file +} From 65f82bd407ca9c2bb0f1a023cde8443e7e7e2045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=A9ndez?= Date: Thu, 23 May 2019 19:11:15 +0200 Subject: [PATCH 4/4] Revert "Update CHANGELOG" This reverts commit 13a313a5c93e431a5c0fb3ba0cac815b4091c74b. --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abd993e8d72..5b2f1b66664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,7 +118,6 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We fixed an issue where a database exception related to a missing timezone was too big. [#4827](https://github.com/JabRef/jabref/issues/4827) - We fixed an issue where the command line help text had several errors, and arguments and descriptions have been rewritten to simplify and detail them better. [#4932](https://github.com/JabRef/jabref/issues/2016) - We fixed an issue where the same menu for changing entry type had two different sizes and weights. [#4977](https://github.com/JabRef/jabref/issues/4977) -- We fixed an issue where the background color of all dialogs in the dark theme was the same as in the light one. [#4987](https://github.com/JabRef/jabref/issues/4987) ### Removed