From ba5b920ea448f601d2c2a2cede6ded46ba009a7b Mon Sep 17 00:00:00 2001
From: woodser <13068859+woodser@users.noreply.github.com>
Date: Fri, 30 May 2025 12:01:27 -0400
Subject: [PATCH] popups with inputs have darker color in light mode

---
 desktop/src/main/java/haveno/desktop/haveno.css  | 16 ++++++++++------
 .../overlays/windows/DisputeSummaryWindow.java   |  2 +-
 .../windows/SignPaymentAccountsWindow.java       |  2 +-
 .../windows/SignSpecificWitnessWindow.java       |  1 +
 .../windows/SignUnsignedPubKeysWindow.java       |  1 +
 .../VerifyDisputeResultSignatureWindow.java      |  1 +
 .../src/main/java/haveno/desktop/theme-dark.css  |  3 ++-
 .../src/main/java/haveno/desktop/theme-light.css |  3 ++-
 8 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/desktop/src/main/java/haveno/desktop/haveno.css b/desktop/src/main/java/haveno/desktop/haveno.css
index 0f6118bf1b..bb8a2ed4a1 100644
--- a/desktop/src/main/java/haveno/desktop/haveno.css
+++ b/desktop/src/main/java/haveno/desktop/haveno.css
@@ -1422,15 +1422,15 @@ textfield */
 }
 
 .text-area-popup {
-    -fx-border-color: -bs-color-background-popup-overlay;
+    -fx-border-color: -bs-color-background-popup-blur;
 }
 
 .text-area-popup .content {
-    -fx-background-color: -bs-color-background-popup-overlay;
+    -fx-background-color: -bs-color-background-popup-blur;
 }
 
 .text-area-popup:focused {
-    -fx-faint-focus-color: -bs-color-background-popup-overlay;
+    -fx-faint-focus-color: -bs-color-background-popup-blur;
 }
 
 .notification-popup-bg .text-area-popup, .peer-info-popup-bg .text-area-popup {
@@ -1970,7 +1970,7 @@ textfield */
  *                                                                             *
  ******************************************************************************/
 .grid-pane {
-    -fx-background-color: -bs-color-background-popup-overlay;
+    -fx-background-color: -bs-color-background-popup-blur;
     -fx-background-insets: 10;
     -fx-background-radius: 15;
     -fx-border-radius: 15;
@@ -2270,7 +2270,7 @@ textfield */
 
 .popup-bg {
     -fx-font-size: 1.077em;
-    -fx-background-color: -bs-color-background-popup-overlay;
+    -fx-background-color: -bs-color-background-popup-blur;
     -fx-background-insets: 44;
     -fx-background-radius: 15;
     -fx-border-radius: 15;
@@ -2289,7 +2289,7 @@ textfield */
 .popup-bg-top {
     -fx-font-size: 1.077em;
     -fx-text-fill: -bs-rd-font-dark;
-    -fx-background-color: -bs-color-background-popup-overlay;
+    -fx-background-color: -bs-color-background-popup-blur;
     -fx-background-insets: 44;
     -fx-background-radius: 0 0 15px 15px;
 }
@@ -2673,3 +2673,7 @@ textfield */
     -fx-font-family: "IBM Plex Sans";
     -fx-font-weight: normal;
 }
+
+.popup-with-input {
+    -fx-background-color: -bs-color-background-popup-input;
+}
diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
index eb6cd9b8cc..49931e202b 100644
--- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
+++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
@@ -188,7 +188,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
     protected void createGridPane() {
         super.createGridPane();
         gridPane.setPadding(new Insets(35, 40, 30, 40));
-        gridPane.getStyleClass().add("grid-pane");
+        gridPane.getStyleClass().addAll("grid-pane", "popup-with-input");
         gridPane.getColumnConstraints().get(0).setHalignment(HPos.LEFT);
         gridPane.setPrefWidth(width);
     }
diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignPaymentAccountsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignPaymentAccountsWindow.java
index fe8b8c9009..3bf7be6b14 100644
--- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignPaymentAccountsWindow.java
+++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignPaymentAccountsWindow.java
@@ -113,7 +113,7 @@ public class SignPaymentAccountsWindow extends Overlay<SignPaymentAccountsWindow
         // We want to have more space to read list entries... initial screen does not look so nice now, but
         // dynamically updating height of window is a bit tricky.... @christoph feel free to improve if you like...
         gridPane.setPrefHeight(600);
-
+        gridPane.getStyleClass().add("popup-with-input");
         gridPane.getColumnConstraints().get(1).setHgrow(Priority.NEVER);
 
         headLine(Res.get("popup.accountSigning.selectAccounts.headline"));
diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignSpecificWitnessWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignSpecificWitnessWindow.java
index f008dd7b9e..cd9ebba4ac 100644
--- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignSpecificWitnessWindow.java
+++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignSpecificWitnessWindow.java
@@ -67,6 +67,7 @@ public class SignSpecificWitnessWindow extends Overlay<SignSpecificWitnessWindow
 
         gridPane.setPrefHeight(600);
         gridPane.getColumnConstraints().get(1).setHgrow(Priority.NEVER);
+        gridPane.getStyleClass().add("popup-with-input");
         headLine(Res.get("popup.accountSigning.singleAccountSelect.headline"));
         type = Type.Attention;
 
diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java
index 6b618adf68..cfed34d8c9 100644
--- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java
+++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java
@@ -92,6 +92,7 @@ public class SignUnsignedPubKeysWindow extends Overlay<SignUnsignedPubKeysWindow
 
         gridPane.setPrefHeight(600);
         gridPane.getColumnConstraints().get(1).setHgrow(Priority.NEVER);
+        gridPane.getStyleClass().add("popup-with-input");
         headLine(Res.get("popup.accountSigning.singleAccountSelect.headline"));
         type = Type.Attention;
 
diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java
index fd60d07193..a8bd993219 100644
--- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java
+++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java
@@ -77,6 +77,7 @@ public class VerifyDisputeResultSignatureWindow extends Overlay<VerifyDisputeRes
         gridPane.setVgap(5);
         gridPane.setPadding(new Insets(64, 64, 64, 64));
         gridPane.setPrefWidth(width);
+        gridPane.getStyleClass().add("popup-with-input");
 
         ColumnConstraints columnConstraints1 = new ColumnConstraints();
         columnConstraints1.setHalignment(HPos.RIGHT);
diff --git a/desktop/src/main/java/haveno/desktop/theme-dark.css b/desktop/src/main/java/haveno/desktop/theme-dark.css
index f3a183308e..17a6cea4bd 100644
--- a/desktop/src/main/java/haveno/desktop/theme-dark.css
+++ b/desktop/src/main/java/haveno/desktop/theme-dark.css
@@ -45,7 +45,8 @@
     -bs-color-gray-fafa: #0a0a0a;
     -bs-color-gray-background: black;
     -bs-color-background-popup: rgb(38, 38, 38);
-    -bs-color-background-popup-overlay: rgb(9, 9, 9);
+    -bs-color-background-popup-blur: rgb(9, 9, 9);
+    -bs-color-background-popup-input: rgb(9, 9, 9);
     -bs-color-background-form-field: rgb(26, 26, 26);
     -bs-color-background-form-field-readonly: rgb(18, 18, 18);
     -bs-color-border-form-field: rgb(65, 65, 65);
diff --git a/desktop/src/main/java/haveno/desktop/theme-light.css b/desktop/src/main/java/haveno/desktop/theme-light.css
index 401a890ffb..808f16d825 100644
--- a/desktop/src/main/java/haveno/desktop/theme-light.css
+++ b/desktop/src/main/java/haveno/desktop/theme-light.css
@@ -115,7 +115,8 @@
     -bs-color-background-row-odd: derive(-bs-color-background-pane, -6%);
     -bs-color-table-cell-dim: -bs-color-gray-ccc;
     -bs-color-background-popup: white;
-    -bs-color-background-popup-overlay: white;
+    -bs-color-background-popup-blur: white;
+    -bs-color-background-popup-input: -bs-color-gray-background;
     -bs-color-background-form-field: white;
     -bs-text-color-dim1: black;
     -bs-text-color-dim2: black;