From 8ee05640478919bd84cb08fac659dc1f1c1ae0ba Mon Sep 17 00:00:00 2001 From: woodser <13068859+woodser@users.noreply.github.com> Date: Wed, 14 May 2025 13:48:01 -0400 Subject: [PATCH] wip tableview colors lighters --- .../src/main/java/haveno/desktop/haveno.css | 18 ++++++++++++++---- .../main/java/haveno/desktop/theme-dark.css | 4 +++- .../main/java/haveno/desktop/theme-light.css | 4 +++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/desktop/src/main/java/haveno/desktop/haveno.css b/desktop/src/main/java/haveno/desktop/haveno.css index 982093d006..0af3d90a2a 100644 --- a/desktop/src/main/java/haveno/desktop/haveno.css +++ b/desktop/src/main/java/haveno/desktop/haveno.css @@ -1112,7 +1112,7 @@ textfield */ -fx-border-color: -bs-color-background-row-odd; } .table-view .table-row-cell.row-faded .table-cell .text { - -fx-fill: -bs-color-table-cell-faded; + -fx-fill: -bs-color-table-cell-dim; } .cell-faded { -fx-opacity: 0.4; @@ -1190,6 +1190,10 @@ textfield */ -fx-padding: 0; } +.table-view .table-row-cell .label { + -fx-text-fill: -bs-text-color; +} + .table-view .column-header-background { -fx-background-color: -bs-color-background-pane; -fx-border-color: -bs-color-border-form-field; @@ -1201,6 +1205,7 @@ textfield */ -fx-font-weight: normal; -fx-font-size: 0.923em; -fx-padding: 6 0 6 0; + -fx-text-fill: -bs-text-color; } .table-view .column-header { @@ -1208,9 +1213,6 @@ textfield */ -fx-background-color: -bs-color-background-pane; } -.table-view .text { - -fx-fill: -bs-text-color; -} /* horizontal scrollbars are never needed and are flickering at scaling so lets turn them off */ .table-view > .scroll-bar:horizontal { @@ -1336,6 +1338,14 @@ textfield */ -fx-padding: 5 25 5 25; } +.table-view.offer-table .column-header .label { + -fx-text-fill: -bs-text-color-dim1; +} + +.table-view.offer-table .table-row-cell .label { + -fx-text-fill: -bs-text-color-dim2; +} + /******************************************************************************* * * * Icons * diff --git a/desktop/src/main/java/haveno/desktop/theme-dark.css b/desktop/src/main/java/haveno/desktop/theme-dark.css index f190cf25d3..2d379486c6 100644 --- a/desktop/src/main/java/haveno/desktop/theme-dark.css +++ b/desktop/src/main/java/haveno/desktop/theme-dark.css @@ -50,7 +50,9 @@ -bs-color-background-pane: rgb(15, 15, 15); -bs-color-background-row-even: rgb(19, 19, 19); -bs-color-background-row-odd: rgb(9, 9, 9); - -bs-color-table-cell-faded: -bs-color-gray-ccc; + -bs-color-table-cell-dim: -bs-color-gray-ccc; + -bs-text-color-dim1: rgb(87, 87, 87); + -bs-text-color-dim2: rgb(130, 130, 130); /* lesser used colors */ -bs-color-blue-5: #0a4576; diff --git a/desktop/src/main/java/haveno/desktop/theme-light.css b/desktop/src/main/java/haveno/desktop/theme-light.css index 27e45e8e37..28069b11ec 100644 --- a/desktop/src/main/java/haveno/desktop/theme-light.css +++ b/desktop/src/main/java/haveno/desktop/theme-light.css @@ -113,9 +113,11 @@ -bs-color-background-pane: -bs-background-color; -bs-color-background-row-even: -bs-color-background-pane; -bs-color-background-row-odd: derive(-bs-color-background-pane, -6%); - -bs-color-table-cell-faded: -bs-color-gray-ccc; + -bs-color-table-cell-dim: -bs-color-gray-ccc; -bs-color-background-popup: white; -bs-color-background-form-field: white; + -bs-text-color-dim1: black; + -bs-text-color-dim2: black; /* Monero orange color code */