From 6b72824ae687acac0823fb90ea8e493107d72839 Mon Sep 17 00:00:00 2001 From: Rubesh S Date: Wed, 18 Oct 2023 20:41:36 +0800 Subject: [PATCH] Fix style --- src/main/java/unicash/MainApp.java | 6 ++--- .../java/unicash/model/category/Category.java | 2 +- src/main/resources/view/DarkTheme.css | 26 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/unicash/MainApp.java b/src/main/java/unicash/MainApp.java index 860d83767ba..47a27e251d4 100644 --- a/src/main/java/unicash/MainApp.java +++ b/src/main/java/unicash/MainApp.java @@ -172,10 +172,10 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) { @Override public void start(Stage primaryStage) { logger.info("Starting UniCash " + MainApp.VERSION); - Font.loadFont(getClass().getResourceAsStream("/fonts/Inter-Bold.ttf"), 12); - Font.loadFont(getClass().getResourceAsStream("/fonts/Inter-Medium.ttf"), 12); Font.loadFont(getClass().getResourceAsStream("/fonts/Inter-Regular.ttf"), 12); - Font.loadFont(getClass().getResourceAsStream("/fonts/Inter-SemiBold.ttf"), 12); + // Font.loadFont(getClass().getResourceAsStream("/fonts/Inter-Medium.ttf"), 12); + // Font.loadFont(getClass().getResourceAsStream("/fonts/Inter-Bold.ttf"), 12); + // Font.loadFont(getClass().getResourceAsStream("/fonts/Inter-SemiBold.ttf"), 12); ui.start(primaryStage); } diff --git a/src/main/java/unicash/model/category/Category.java b/src/main/java/unicash/model/category/Category.java index f84eb5a0e0b..46851a41754 100644 --- a/src/main/java/unicash/model/category/Category.java +++ b/src/main/java/unicash/model/category/Category.java @@ -56,7 +56,7 @@ public int hashCode() { * Format state as text for viewing. */ public String toString() { - return '[' + category + ']'; + return category; } } diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css index 9e0b86260a4..335d1929188 100644 --- a/src/main/resources/view/DarkTheme.css +++ b/src/main/resources/view/DarkTheme.css @@ -5,28 +5,28 @@ .label { -fx-font-size: 11pt; - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-text-fill: #555555; -fx-opacity: 0.9; } .label-bright { -fx-font-size: 11pt; - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-text-fill: white; -fx-opacity: 1; } .label-header { -fx-font-size: 32pt; - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-text-fill: white; -fx-opacity: 1; } .text-field { -fx-font-size: 12pt; - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; } .tab-pane { @@ -66,7 +66,7 @@ .table-view .column-header .label { -fx-font-size: 20pt; - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-text-fill: black; -fx-alignment: center-left; -fx-opacity: 1; @@ -121,13 +121,13 @@ } .cell_big_label { - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-font-size: 16px; -fx-text-fill: #010504; } .cell_small_label { - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-font-size: 13px; -fx-text-fill: #010504; } @@ -149,7 +149,7 @@ .result-display { -fx-background-color: transparent; - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-font-size: 13pt; -fx-text-fill: black; } @@ -159,7 +159,7 @@ } .status-bar .label { - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-text-fill: black; -fx-padding: 4px; -fx-pref-height: 30px; @@ -199,7 +199,7 @@ .menu-bar .label { -fx-font-size: 14pt; - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-text-fill: black; -fx-opacity: 0.9; } @@ -219,7 +219,7 @@ -fx-border-width: 2; -fx-background-radius: 0; -fx-background-color: #F3F3F3; - -fx-font-family: "Inter-Bold", Helvetica, Arial, sans-serif; + -fx-font-family: "Inter", Helvetica, Arial, sans-serif; -fx-font-size: 11pt; -fx-text-fill: #d8d8d8; -fx-background-insets: 0 0 0 0, 0, 1, 2; @@ -323,7 +323,7 @@ -fx-background-insets: 0; -fx-border-insets: 3; -fx-border-width: 1; - -fx-font-family: "Inter-Bold"; + -fx-font-family: "Inter"; -fx-font-size: 13pt; -fx-text-fill: #575757; } @@ -354,7 +354,7 @@ } #categories { - -fx-font-family: "Inter-Bold" + -fx-font-family: "Inter"; -fx-label-padding: 2 3 2 3; -fx-background-color: #FFD43E; -fx-background-radius: 4;