From 2aaf9265e27617c2d6d72937de7f29a799b839b5 Mon Sep 17 00:00:00 2001 From: axpoems <145597137+axpoems@users.noreply.github.com> Date: Wed, 25 Sep 2024 07:57:11 +0200 Subject: [PATCH 1/2] Set the same size for search and dropdown items --- .../java/bisq/desktop/components/table/RichTableView.java | 1 + apps/desktop/desktop/src/main/resources/css/containers.css | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/components/table/RichTableView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/components/table/RichTableView.java index f4a89f04b1..385c993fa3 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/components/table/RichTableView.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/components/table/RichTableView.java @@ -165,6 +165,7 @@ private RichTableView(SortedList sortedList, VBox.setVgrow(tableView, Priority.ALWAYS); VBox.setMargin(footerVBox, new Insets(10, 0, 0, 0)); getChildren().addAll(headerBox, tableView, footerVBox); + getStyleClass().add("rich-table-view-box"); listChangeListener = c -> listItemsChanged(); toggleChangeListener = (observable, oldValue, newValue) -> selectedFilterMenuItemChanged(); diff --git a/apps/desktop/desktop/src/main/resources/css/containers.css b/apps/desktop/desktop/src/main/resources/css/containers.css index e717383c43..29b92cd7a8 100644 --- a/apps/desktop/desktop/src/main/resources/css/containers.css +++ b/apps/desktop/desktop/src/main/resources/css/containers.css @@ -356,6 +356,13 @@ * * ******************************************************************************/ +.rich-table-view-box { +} + +.rich-table-view-box .dropdown-menu { + -fx-padding: 5; +} + .standard-table-headline { -fx-font-size: 1.8em; -fx-font-family: "IBM Plex Sans Light"; From d2edb5dd8b1c0c01a29953e7c634899773a2a3d0 Mon Sep 17 00:00:00 2001 From: axpoems <145597137+axpoems@users.noreply.github.com> Date: Wed, 25 Sep 2024 08:00:41 +0200 Subject: [PATCH 2/2] Rename standard classes with rich --- .../bisq/desktop/components/table/RichTableView.java | 8 ++++---- .../content/network/my_node/transport/SystemLoad.java | 8 ++++---- .../content/network/my_node/transport/Traffic.java | 4 ++-- .../network/p2p/version/VersionDistributionView.java | 2 +- .../desktop/src/main/resources/css/containers.css | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/components/table/RichTableView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/components/table/RichTableView.java index 385c993fa3..eb396dc8c1 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/components/table/RichTableView.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/components/table/RichTableView.java @@ -124,11 +124,11 @@ private RichTableView(SortedList sortedList, headlineLabel = new Label(headline.orElse("")); headlineLabel.setManaged(headline.isPresent()); headlineLabel.setVisible(headlineLabel.isManaged()); - headlineLabel.getStyleClass().add("standard-table-headline"); + headlineLabel.getStyleClass().add("rich-table-headline"); headlineLabel.setAlignment(Pos.BASELINE_LEFT); tableView = new BisqTableView<>(sortedList); - tableView.getStyleClass().add("standard-table-view"); + tableView.getStyleClass().add("rich-table-view"); tableView.setMinHeight(200); filterMenu = new DropdownMenu("chevron-drop-menu-grey", "chevron-drop-menu-white", false); @@ -150,11 +150,11 @@ private RichTableView(SortedList sortedList, headerBox.setAlignment(Pos.BASELINE_LEFT); numEntriesLabel = new Label(); - numEntriesLabel.getStyleClass().add("standard-table-num-entries"); + numEntriesLabel.getStyleClass().add("rich-table-num-entries"); numEntriesLabel.setAlignment(Pos.BASELINE_LEFT); exportHyperlink = new Hyperlink(Res.get("action.exportAsCsv")); - exportHyperlink.getStyleClass().add("standard-table-num-entries"); + exportHyperlink.getStyleClass().add("rich-table-num-entries"); exportHyperlink.setAlignment(Pos.BASELINE_LEFT); HBox.setMargin(exportHyperlink, new Insets(8, 10, 0, 0)); diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/SystemLoad.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/SystemLoad.java index 5d94cfd4da..ef60ef46c0 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/SystemLoad.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/SystemLoad.java @@ -136,19 +136,19 @@ private View(Model model, Controller controller) { super(new VBox(10), model, controller); Label powHeadline = new Label(Res.get("network.transport.pow.headline")); - powHeadline.getStyleClass().add("standard-table-headline"); + powHeadline.getStyleClass().add("rich-table-headline"); pow = new Label(); - pow.getStyleClass().add("standard-table-view"); + pow.getStyleClass().add("rich-table-view"); pow.setPadding(new Insets(10)); pow.setAlignment(Pos.TOP_LEFT); pow.setPrefWidth(4000); Label systemLoadHeadline = new Label(Res.get("network.transport.systemLoad.headline")); - systemLoadHeadline.getStyleClass().add("standard-table-headline"); + systemLoadHeadline.getStyleClass().add("rich-table-headline"); systemLoad = new Label(); - systemLoad.getStyleClass().add("standard-table-view"); + systemLoad.getStyleClass().add("rich-table-view"); systemLoad.setPadding(new Insets(10)); systemLoad.setAlignment(Pos.TOP_LEFT); systemLoad.setPrefWidth(4000); diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/Traffic.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/Traffic.java index f52dabae1c..63757ab529 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/Traffic.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/Traffic.java @@ -184,10 +184,10 @@ protected void onViewDetached() { } private VBox getVBox(Label headline, Label details) { - headline.getStyleClass().add("standard-table-headline"); + headline.getStyleClass().add("rich-table-headline"); VBox vBox = new VBox(10, headline, details); vBox.setAlignment(Pos.TOP_LEFT); - details.getStyleClass().add("standard-table-view"); + details.getStyleClass().add("rich-table-view"); details.setPadding(new Insets(10, 10, 15, 10)); details.setAlignment(Pos.TOP_LEFT); details.setPrefWidth(4000); diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/p2p/version/VersionDistributionView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/p2p/version/VersionDistributionView.java index 66902b7893..459c2bb1a9 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/p2p/version/VersionDistributionView.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/network/p2p/version/VersionDistributionView.java @@ -46,7 +46,7 @@ public VersionDistributionView(VersionDistributionModel model, VersionDistributi Label localVersionHeadline = new Label(Res.get("network.version.localVersion.headline")); - localVersionHeadline.getStyleClass().add("standard-table-headline"); + localVersionHeadline.getStyleClass().add("rich-table-headline"); Label details = new Label(Res.get("network.version.localVersion.details", ApplicationVersion.getVersion().getVersionAsString(), diff --git a/apps/desktop/desktop/src/main/resources/css/containers.css b/apps/desktop/desktop/src/main/resources/css/containers.css index 29b92cd7a8..5c5babef46 100644 --- a/apps/desktop/desktop/src/main/resources/css/containers.css +++ b/apps/desktop/desktop/src/main/resources/css/containers.css @@ -352,7 +352,7 @@ /******************************************************************************* * * - * StandardTable * + * RichTable * * * ******************************************************************************/ @@ -363,23 +363,23 @@ -fx-padding: 5; } -.standard-table-headline { +.rich-table-headline { -fx-font-size: 1.8em; -fx-font-family: "IBM Plex Sans Light"; -fx-text-fill: -fx-light-text-color; } -.standard-table-view { +.rich-table-view { -fx-background-color: -bisq-dark-grey-20; -fx-border-color: transparent; -fx-padding: 0; } -.standard-table-view .column-header { +.rich-table-view .column-header { -fx-background-color: -bisq-dark-grey-30; } -.standard-table-num-entries { +.rich-table-num-entries { -fx-font-size: 0.9em; -fx-font-family: "IBM Plex Sans Light"; -fx-text-fill: -bisq-mid-grey-20;