From d3b193ce16529f768f7196cdf458c5f82f472226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=A9ndez?= Date: Fri, 24 May 2019 10:24:30 +0200 Subject: [PATCH 1/7] Fix background color of dialogs in dark mode (#4994) * Fix background color of dialogs in dark mode * Update CHANGELOG * Add new line at end of Base.css * Revert "Update CHANGELOG" This reverts commit 13a313a5c93e431a5c0fb3ba0cac815b4091c74b. --- 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 642fe8dcf887..2db5a049c001 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; +} diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.css b/src/main/java/org/jabref/gui/help/AboutDialog.css index 8406e6c9ddf4..9793ab8df1e0 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 d65cfddeed05..8933d9096a31 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 3ebc59a764687cb68a6d550c99dce1c686bce174 Mon Sep 17 00:00:00 2001 From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com> Date: Sat, 25 May 2019 14:09:29 +0200 Subject: [PATCH 2/7] Fix icon size - the second (#4993) * Refactor fixing wrong icon size * Refactor and fix configureIconButton --- .../org/jabref/gui/actions/ActionFactory.java | 9 ++------- .../org/jabref/gui/entryeditor/EntryEditor.fxml | 9 ++++++++- .../org/jabref/gui/entryeditor/EntryEditor.java | 16 ++++++---------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java index 07a8ddb3f2fa..60625d13a1ab 100644 --- a/src/main/java/org/jabref/gui/actions/ActionFactory.java +++ b/src/main/java/org/jabref/gui/actions/ActionFactory.java @@ -4,7 +4,6 @@ import java.lang.reflect.Method; import java.util.Objects; -import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.ButtonBase; import javafx.scene.control.CheckMenuItem; @@ -148,13 +147,9 @@ public ButtonBase configureIconButton(Action action, Command command, ButtonBase button.getStyleClass().add("icon-button"); // For some reason the graphic is not set correctly, so let's fix this + // ToDO: Find a way to reuse JabRefIconView button.graphicProperty().unbind(); - action.getIcon().ifPresent(icon -> { - // ToDO: Find a way to reuse JabRefIconView - Node graphicNode = icon.getGraphicNode(); - graphicNode.setStyle(String.format("-fx-font-family: %s; -fx-font-size: %s;", icon.fontFamily(), "1em")); - button.setGraphic(graphicNode); - }); + action.getIcon().ifPresent(icon -> button.setGraphic(icon.getGraphicNode())); return button; } diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml index d4cd990c09bc..35fb41daa74b 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml @@ -40,7 +40,14 @@ -