From aa538992f0e817174b52c6c14c37a215fb59cebf Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 18 Dec 2019 12:50:50 +0100 Subject: [PATCH 1/2] Make popover text readable in dark mode --- desktop/src/main/java/bisq/desktop/bisq.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop/src/main/java/bisq/desktop/bisq.css b/desktop/src/main/java/bisq/desktop/bisq.css index 89c9dc0df51..dc325f2ff20 100644 --- a/desktop/src/main/java/bisq/desktop/bisq.css +++ b/desktop/src/main/java/bisq/desktop/bisq.css @@ -2049,4 +2049,8 @@ textfield */ -fx-text-fill: -bs-text-color; } +.popover > .border { + -fx-stroke: linear-gradient(to bottom, -bs-text-color-transparent, -bs-text-color-transparent-dark) !important; + -fx-fill: -bs-background-color !important; +} From 7c190ca9c53d7ebfa873ad061ce89fc7a2b6d74f Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 18 Dec 2019 13:00:34 +0100 Subject: [PATCH 2/2] Make progress bar track styleable --- desktop/src/main/java/bisq/desktop/bisq.css | 4 ++++ desktop/src/main/java/bisq/desktop/theme-dark.css | 2 +- desktop/src/main/java/bisq/desktop/theme-light.css | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/bisq.css b/desktop/src/main/java/bisq/desktop/bisq.css index dc325f2ff20..f8e23875636 100644 --- a/desktop/src/main/java/bisq/desktop/bisq.css +++ b/desktop/src/main/java/bisq/desktop/bisq.css @@ -128,6 +128,10 @@ -fx-background-color: -bs-rd-error-red; } +.jfx-progress-bar > .track { + -fx-background-color: -bs-progress-bar-track; +} + .jfx-spinner { -jfx-radius: 10; } diff --git a/desktop/src/main/java/bisq/desktop/theme-dark.css b/desktop/src/main/java/bisq/desktop/theme-dark.css index 1306aa4f856..8306ff80cb7 100644 --- a/desktop/src/main/java/bisq/desktop/theme-dark.css +++ b/desktop/src/main/java/bisq/desktop/theme-dark.css @@ -122,9 +122,9 @@ -bs-cancel: #1d1d21; -bs-cancel-focus: black; -bs-cancel-hover: #050506; - -bs-green-soft: derive(-bs-rd-green, 60%); -bs-red-soft: derive(-bs-rd-error-red, 60%); + -bs-progress-bar-track: #272728; } /* list view */ diff --git a/desktop/src/main/java/bisq/desktop/theme-light.css b/desktop/src/main/java/bisq/desktop/theme-light.css index 6dfedcfe025..a29c05630f3 100644 --- a/desktop/src/main/java/bisq/desktop/theme-light.css +++ b/desktop/src/main/java/bisq/desktop/theme-light.css @@ -99,4 +99,5 @@ -fx-selection-bar: #e1f5e3; -fx-selection-bar-non-focused: -fx-selection-bar; -fx-default-button: derive(-fx-accent, 95%); + -bs-progress-bar-track: #e0e0e0; }