Merge pull request #2855 from axpoems/further-imp-rep

Further improvements in ranking section
bisq-network · Sep 26, 2024 · 283bcff · 283bcff
2 parents f5ea739 + d2edb5d
commit 283bcff
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 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
@@ -124,11 +124,11 @@ private RichTableView(SortedList<T> 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<T> 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));
@@ -165,6 +165,7 @@ private RichTableView(SortedList<T> 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/...desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/SystemLoad.java b/...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/...op/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/Traffic.java b/...op/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/.../src/main/java/bisq/desktop/main/content/network/p2p/version/VersionDistributionView.java b/.../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
@@ -352,27 +352,34 @@
 
 /*******************************************************************************
  *                                                                             *
- * StandardTable                                                               *
+ * RichTable                                                                   *
  *                                                                             *
  ******************************************************************************/
 
-.standard-table-headline {
+.rich-table-view-box {
+}
+
+.rich-table-view-box .dropdown-menu {
+    -fx-padding: 5;
+}
+
+.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;