Skip to content

Commit

Permalink
Fix style
Browse files Browse the repository at this point in the history
  • Loading branch information
sp4ce-cowboy committed Oct 18, 2023
1 parent 3b9e838 commit 6b72824
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions src/main/java/unicash/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/unicash/model/category/Category.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public int hashCode() {
* Format state as text for viewing.
*/
public String toString() {
return '[' + category + ']';
return category;
}

}
26 changes: 13 additions & 13 deletions src/main/resources/view/DarkTheme.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 6b72824

Please sign in to comment.