From 29e1e27796ae8a2b669407df8cacd01a74819283 Mon Sep 17 00:00:00 2001 From: Carl Christian Snethlage Date: Mon, 16 Aug 2021 19:28:11 +0200 Subject: [PATCH 1/4] Fix icon color --- src/main/java/org/jabref/gui/Base.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css index 284b6822b93..1aae564ddb2 100644 --- a/src/main/java/org/jabref/gui/Base.css +++ b/src/main/java/org/jabref/gui/Base.css @@ -272,6 +272,10 @@ -fx-fill: -fx-text-base-color; } +.ikonli-font-icon { + -fx-icon-color: -fx-text-base-color; +} + .tooltip { -fx-background-color: -jr-tooltip-bg; -fx-opacity: 95%; @@ -859,10 +863,12 @@ -fx-padding: 0.3em 0.9em 0.3em 0.9em; } -.sidePaneComponentHeader .glyph-icon { +.sidePaneComponentHeader .glyph-icon, +.sidePaneComponentHeader .ikonli-font-icon { -fx-fill: -jr-sidepane-header-color; -fx-text-fill: -jr-sidepane-header-color; -fx-font-size: 16px; + -fx-icon-color: -jr-theme-text; } .mainMenu { @@ -938,10 +944,12 @@ -fx-border-width: 0; } -.mainToolbar .glyph-icon { +.mainToolbar .glyph-icon, +.mainToolbar .ikonli-font-icon { -fx-font-size: 1.7em; -fx-fill: -jr-theme-text; -fx-text-fill: -jr-theme-text; + -fx-icon-color: -jr-theme-text; } .mainToolbar .search-field { From 37bba81581e02cf6ae5fa9fa8d2bf8aefc359d83 Mon Sep 17 00:00:00 2001 From: Carl Christian Snethlage Date: Mon, 16 Aug 2021 20:19:44 +0200 Subject: [PATCH 2/4] Fix group tree icon color --- .../java/org/jabref/gui/icon/InternalMaterialDesignIcon.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java index ec54b368bb7..7ce8a4879ca 100644 --- a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java +++ b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java @@ -46,7 +46,8 @@ public Node getGraphicNode() { // Override the default color from the css files color.ifPresent(color -> fontIcon.setStyle(fontIcon.getStyle() + - String.format("-fx-fill: %s;", ColorUtil.toRGBCode(color)))); + String.format("-fx-fill: %s;", ColorUtil.toRGBCode(color)) + + String.format("-fx-icon-color: %s;", ColorUtil.toRGBCode(color)))); return fontIcon; } From 9ce0c102cb860a2ecccde7c4a5e8a46c154d2c13 Mon Sep 17 00:00:00 2001 From: Carl Christian Snethlage Date: Mon, 16 Aug 2021 20:20:37 +0200 Subject: [PATCH 3/4] Fix preferences icon --- src/main/java/org/jabref/gui/actions/StandardActions.java | 4 ++-- src/main/java/org/jabref/gui/icon/IconTheme.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java index 4519e5b3f4a..bee310998ad 100644 --- a/src/main/java/org/jabref/gui/actions/StandardActions.java +++ b/src/main/java/org/jabref/gui/actions/StandardActions.java @@ -109,10 +109,10 @@ public enum StandardActions implements Action { SETUP_GENERAL_FIELDS(Localization.lang("Set up general fields")), MANAGE_PROTECTED_TERMS(Localization.lang("Manage protected terms")), CITATION_KEY_PATTERN(Localization.lang("Citation key patterns")), - SHOW_PREFS(Localization.lang("Preferences")), + SHOW_PREFS(Localization.lang("Preferences"), IconTheme.JabRefIcons.PREFERENCES), MANAGE_JOURNALS(Localization.lang("Manage journal abbreviations")), CUSTOMIZE_KEYBINDING(Localization.lang("Customize key bindings"), IconTheme.JabRefIcons.KEY_BINDINGS), - MANAGE_CONTENT_SELECTORS(Localization.lang("Manage content selectors"), IconTheme.JabRefIcons.PREFERENCES), + MANAGE_CONTENT_SELECTORS(Localization.lang("Manage content selectors"), IconTheme.JabRefIcons.SELECTORS), MANAGE_CITE_KEY_PATTERNS(Localization.lang("Citation key patterns")), EDIT_ENTRY(Localization.lang("Open entry editor"), IconTheme.JabRefIcons.EDIT_ENTRY, KeyBinding.EDIT_ENTRY), diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java index 765571ee1a3..44d04e8af6d 100644 --- a/src/main/java/org/jabref/gui/icon/IconTheme.java +++ b/src/main/java/org/jabref/gui/icon/IconTheme.java @@ -193,7 +193,8 @@ public enum JabRefIcons implements JabRefIcon { SEARCH(MaterialDesignM.MAGNIFY), FILE_SEARCH(MaterialDesignF.FILE_FIND), ADVANCED_SEARCH(Color.CYAN, MaterialDesignM.MAGNIFY), - PREFERENCES(MaterialDesignS.STAR_SETTINGS), + PREFERENCES(MaterialDesignC.COG), + SELECTORS(MaterialDesignS.STAR_SETTINGS), HELP(MaterialDesignH.HELP_CIRCLE), UP(MaterialDesignA.ARROW_UP), DOWN(MaterialDesignA.ARROW_DOWN), From 5f48b3884de38f6a614bed20d9fa83bba307f266 Mon Sep 17 00:00:00 2001 From: Carl Christian Snethlage Date: Mon, 16 Aug 2021 20:28:24 +0200 Subject: [PATCH 4/4] Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29aabcaeaf4..ee5f5cc08ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve ### Fixed - We fixed an issue when checking for a new version when JabRef is used behind a corporate proxy. [#7884](https://github.com/JabRef/jabref/issues/7884) +- We fixed some icons that were drawn in the wrong color when JabRef used a custom theme. [#7853](https://github.com/JabRef/jabref/issues/7853) - We fixed an issue where the `Aux file` on `Edit group` doesn't support relative sub-directories path to import. [#7719](https://github.com/JabRef/jabref/issues/7719). - We fixed an issue where it was impossible to add or modify groups. [#7912](https://github.com/JabRef/jabref/pull/793://github.com/JabRef/jabref/pull/7921) - We fixed an issue where exported entries from a Citavi bib containing URLs could not be imported [#7892](https://github.com/JabRef/jabref/issues/7882)