From 37751c74c4653dadf630eb3ef766fd2a3282d286 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 24 Mar 2020 12:53:11 +0100 Subject: [PATCH] Make prompt text readable in dark mode --- desktop/src/main/java/bisq/desktop/bisq.css | 8 ++++---- desktop/src/main/java/bisq/desktop/theme-dark.css | 1 + desktop/src/main/java/bisq/desktop/theme-light.css | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/bisq.css b/desktop/src/main/java/bisq/desktop/bisq.css index 44904b9f67b..e09d3aed0bf 100644 --- a/desktop/src/main/java/bisq/desktop/bisq.css +++ b/desktop/src/main/java/bisq/desktop/bisq.css @@ -701,11 +701,11 @@ tree-table-view:focused { } .text-field { - -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%); + -fx-prompt-text-fill: derive(-bs-prompt-text, -30%); } .text-area { - -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%); + -fx-prompt-text-fill: derive(-bs-prompt-text, -30%); } #label-url { @@ -1485,7 +1485,7 @@ textfield */ -fx-text-fill: -fx-text-inner-color; -fx-highlight-fill: derive(-fx-control-inner-background, -20%); -fx-highlight-text-fill: -fx-text-inner-color; - -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%); + -fx-prompt-text-fill: derive(-bs-prompt-text, -30%); -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border), linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background); -fx-background-insets: 0, 1; @@ -1497,7 +1497,7 @@ textfield */ -fx-text-fill: -fx-text-inner-color; -fx-highlight-fill: derive(-fx-control-inner-background, -20%); -fx-highlight-text-fill: -fx-text-inner-color; - -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%); + -fx-prompt-text-fill: derive(-bs-prompt-text, -30%); -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border), linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -bs-color-gray-1); -fx-background-insets: 0, 1; diff --git a/desktop/src/main/java/bisq/desktop/theme-dark.css b/desktop/src/main/java/bisq/desktop/theme-dark.css index b238adfea30..7439b1cf6d1 100644 --- a/desktop/src/main/java/bisq/desktop/theme-dark.css +++ b/desktop/src/main/java/bisq/desktop/theme-dark.css @@ -128,6 +128,7 @@ -bs-chart-tick: rgba(255, 255, 255, 0.7); -bs-chart-lines: rgba(0, 0, 0, 0.3); -bs-white: white; + -bs-prompt-text: -bs-color-gray-3; /* dao chart colors */ -bs-chart-dao-line1: -bs-color-green-5; diff --git a/desktop/src/main/java/bisq/desktop/theme-light.css b/desktop/src/main/java/bisq/desktop/theme-light.css index dcd86a73238..a86cff218b2 100644 --- a/desktop/src/main/java/bisq/desktop/theme-light.css +++ b/desktop/src/main/java/bisq/desktop/theme-light.css @@ -101,6 +101,7 @@ -fx-default-button: derive(-fx-accent, 95%); -bs-progress-bar-track: #e0e0e0; -bs-white: white; + -bs-prompt-text: -fx-control-inner-background; /* dao chart colors */ -bs-chart-dao-line1: -bs-color-green-3;