From 9a95d398ea4aaa9ea19b59f87ba0eb3a5e1b0764 Mon Sep 17 00:00:00 2001 From: Armin Samii Date: Mon, 18 Nov 2024 12:30:43 -0500 Subject: [PATCH 1/3] idea: modernize CSS --- .../network/brightspots/rcv/GuiStyles.css | 138 +++++++++++++++--- 1 file changed, 114 insertions(+), 24 deletions(-) diff --git a/src/main/resources/network/brightspots/rcv/GuiStyles.css b/src/main/resources/network/brightspots/rcv/GuiStyles.css index b52fd6582..555b9547a 100644 --- a/src/main/resources/network/brightspots/rcv/GuiStyles.css +++ b/src/main/resources/network/brightspots/rcv/GuiStyles.css @@ -1,36 +1,126 @@ +/* General styles */ +.root { + -fx-font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + -fx-font-size: 14px; + -fx-background-color: #f4f4f4; +} + +/* Button styles */ +.button { + -fx-background-color: #0078d7; + -fx-text-fill: white; + -fx-padding: 10px 20px; + -fx-border-radius: 5px; + -fx-background-radius: 5px; +} + +.button:hover { + -fx-background-color: #005a9e; +} + +.button:focused { + -fx-background-color: #005a9e; + -fx-border-color: #003f6b; + -fx-border-width: 1px; +} + +/* TextField styles */ +.text-field { + -fx-background-color: white; + -fx-border-color: #c4c4c4; + -fx-border-radius: 5px; + -fx-background-radius: 5px; + -fx-padding: 10px; +} + +.text-field:focused { + -fx-border-color: #0078d7; +} + +/* Label styles */ +.label { + -fx-text-fill: #333333; + -fx-padding: 5px 0; +} + +/* TextArea styles */ +.text-area { + -fx-background-color: white; + -fx-border-color: #c4c4c4; + -fx-border-radius: 5px; + -fx-background-radius: 5px; + -fx-padding: 10px; +} + +.text-area:focused { + -fx-border-color: #0078d7; +} + +/* Table styles */ +.table-view { + -fx-background-color: white; + -fx-border-color: #c4c4c4; + -fx-border-radius: 5px; + -fx-background-radius: 5px; +} -.help-text-area{ - -fx-control-inner-background:#eaeaea; +.table-view .column-header-background { + -fx-background-color: #0078d7; } -.console-text-area{ - -fx-control-inner-background:#282828; +.table-view .column-header, .table-view .filler { + -fx-border-color: transparent; +} + +.table-view .column-header .label { + -fx-text-fill: white; +} + +/* ScrollPane styles */ +.scroll-pane { + -fx-background-color: transparent; +} + +.scroll-pane .viewport { + -fx-background-color: white; +} + +/* Tooltip styles */ +.tooltip { + -fx-background-color: #333333; + -fx-text-fill: white; + -fx-padding: 10px; + -fx-border-radius: 5px; + -fx-background-radius: 5px; +} + +/* Error styles */ +.error, .check-box-error .box { + -fx-focus-color: #d35244; + -fx-faint-focus-color: #d3524422; + -fx-highlight-fill: -fx-accent; + -fx-highlight-text-fill: white; + -fx-background-color: -fx-focus-color, -fx-control-inner-background, -fx-faint-focus-color, linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background); + -fx-background-insets: -0.2, 1, -1.4, 3; + -fx-background-radius: 3, 2, 4, 0; + -fx-prompt-text-fill: transparent; +} + +/* Custom styles */ +.help-text-area { + -fx-control-inner-background: #eaeaea; +} + +.console-text-area { + -fx-control-inner-background: #282828; + -fx-text-fill: #ffffff; -fx-highlight-fill: #ffffff; -fx-highlight-text-fill: #000000; - -fx-text-fill: #ffffff; } .bordered-box { - -fx-border-color: #C4C4C4; + -fx-border-color: #c4c4c4; -fx-border-width: 1px; -fx-border-style: solid; -fx-border-radius: 8px; - } - -.error, .check-box-error .box { - -fx-focus-color: #d35244; - -fx-faint-focus-color: #d3524422; - - -fx-highlight-fill: -fx-accent; - -fx-highlight-text-fill: white; - -fx-background-color: - -fx-focus-color, - -fx-control-inner-background, - -fx-faint-focus-color, - linear-gradient(from 0px 0px to 0px 5px, - derive(-fx-control-inner-background, -9%), - -fx-control-inner-background); - -fx-background-insets: -0.2, 1, -1.4, 3; - -fx-background-radius: 3, 2, 4, 0; - -fx-prompt-text-fill: transparent; } From cfcac6c1ead040b4318d90d1b231ef5222cf7f18 Mon Sep 17 00:00:00 2001 From: Armin Samii Date: Tue, 11 Mar 2025 11:24:33 -0400 Subject: [PATCH 2/3] manual improvements to text colors --- .../java/network/brightspots/rcv/GuiConfigController.java | 5 ++++- src/main/java/network/brightspots/rcv/Logger.java | 1 + src/main/resources/network/brightspots/rcv/GuiStyles.css | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/network/brightspots/rcv/GuiConfigController.java b/src/main/java/network/brightspots/rcv/GuiConfigController.java index 3ab19e37d..791270dcb 100644 --- a/src/main/java/network/brightspots/rcv/GuiConfigController.java +++ b/src/main/java/network/brightspots/rcv/GuiConfigController.java @@ -995,7 +995,10 @@ private void setDefaultValues() { versionText += " -- this is a development version, do not distribute!"; labelVersion.setBackground(new Background(new BackgroundFill( Color.DARKRED, CornerRadii.EMPTY, Insets.EMPTY))); - labelVersion.setTextFill(Color.WHITE); + labelVersion.setStyle("-fx-text-fill: #FFF;" + + "-fx-background-color: darkred;" + + "-fx-background-radius: 4px 0px 0px 4px;" + ); } labelVersion.setText(versionText); labelCurrentlyLoaded.setText("Currently loaded: "); diff --git a/src/main/java/network/brightspots/rcv/Logger.java b/src/main/java/network/brightspots/rcv/Logger.java index 206c6af77..db1db0bfa 100644 --- a/src/main/java/network/brightspots/rcv/Logger.java +++ b/src/main/java/network/brightspots/rcv/Logger.java @@ -252,6 +252,7 @@ public void publish(LogRecord record) { } else if (record.getLevel() == Level.WARNING) { logLabel.setBackground(Background.fill(Color.SIENNA)); } + logLabel.setStyle("-fx-text-fill: #FFF; -fx-label-padding: 2px;"); // On Right Click, user can copy text ContextMenu contextMenu = new ContextMenu(); diff --git a/src/main/resources/network/brightspots/rcv/GuiStyles.css b/src/main/resources/network/brightspots/rcv/GuiStyles.css index 555b9547a..0ee138e79 100644 --- a/src/main/resources/network/brightspots/rcv/GuiStyles.css +++ b/src/main/resources/network/brightspots/rcv/GuiStyles.css @@ -9,7 +9,7 @@ .button { -fx-background-color: #0078d7; -fx-text-fill: white; - -fx-padding: 10px 20px; + -fx-padding: 5px 10px; -fx-border-radius: 5px; -fx-background-radius: 5px; } @@ -30,7 +30,7 @@ -fx-border-color: #c4c4c4; -fx-border-radius: 5px; -fx-background-radius: 5px; - -fx-padding: 10px; + -fx-padding: 5px; } .text-field:focused { @@ -40,7 +40,7 @@ /* Label styles */ .label { -fx-text-fill: #333333; - -fx-padding: 5px 0; + -fx-padding: 5px 5px; } /* TextArea styles */ @@ -73,7 +73,7 @@ } .table-view .column-header .label { - -fx-text-fill: white; + -fx-text-fill: black; } /* ScrollPane styles */ From bf6b87226a5c4b0efaf845b4fe9f7f36e0a6deab Mon Sep 17 00:00:00 2001 From: Armin Samii Date: Tue, 25 Mar 2025 19:19:37 -0600 Subject: [PATCH 3/3] theme updates from review --- .../network/brightspots/rcv/GuiConfigLayout.fxml | 6 +++--- .../resources/network/brightspots/rcv/GuiStyles.css | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/main/resources/network/brightspots/rcv/GuiConfigLayout.fxml b/src/main/resources/network/brightspots/rcv/GuiConfigLayout.fxml index 4f13ee1db..988b85b58 100644 --- a/src/main/resources/network/brightspots/rcv/GuiConfigLayout.fxml +++ b/src/main/resources/network/brightspots/rcv/GuiConfigLayout.fxml @@ -15,11 +15,11 @@ + prefHeight="955.0" prefWidth="1195.0"> @@ -366,7 +366,7 @@ -