From 0c11d562a5ce8d91ed22e440ef5d3248a6b04ca7 Mon Sep 17 00:00:00 2001
From: yyutong <1037662939@qq.com>
Date: Thu, 29 Oct 2020 13:20:19 +0800
Subject: [PATCH] update ui

---
 .../java/seedu/address/ui/PieChartWindow.java |   1 +
 src/main/resources/images/statistics.png      | Bin 0 -> 3425 bytes
 src/main/resources/view/DarkTheme.css         |  24 +++++++++---------
 src/main/resources/view/PieChartWindow.fxml   |   4 +--
 4 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 src/main/resources/images/statistics.png

diff --git a/src/main/java/seedu/address/ui/PieChartWindow.java b/src/main/java/seedu/address/ui/PieChartWindow.java
index ca9cc5d93e0..2bc412f9ad1 100644
--- a/src/main/java/seedu/address/ui/PieChartWindow.java
+++ b/src/main/java/seedu/address/ui/PieChartWindow.java
@@ -79,6 +79,7 @@ public void setStats() {
             PIECHART.setTitle("Statistics of Expense Book");
             PIECHART.setClockwise(false);
             PIECHART.setLabelsVisible(true);
+
         }
 
     }
diff --git a/src/main/resources/images/statistics.png b/src/main/resources/images/statistics.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5dbc64f00718cc98a124c86273716f23e1c386c
GIT binary patch
literal 3425
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
D2XUCp

literal 0
HcmV?d00001

diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 660b0dbcb1d..2d965e3e2d2 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -101,11 +101,11 @@
 }
 
 .list-cell:filled:even {
-    -fx-background-color: #3c3e3f;
+    -fx-background-color: #1A5276;
 }
 
 .list-cell:filled:odd {
-    -fx-background-color: #515658;
+    -fx-background-color: derive(#1A5276, 20%);
 }
 
 .list-cell:filled:selected {
@@ -138,13 +138,13 @@
 }
 
 .pane-with-border {
-     -fx-background-color: derive(#1d1d1d, 20%);
-     -fx-border-color: derive(#1d1d1d, 10%);
+     -fx-background-color: derive(#1A5276, 20%);
+     -fx-border-color: derive(#1A5276, 10%);
      -fx-border-top-width: 1px;
 }
 
 .status-bar {
-    -fx-background-color: derive(#1d1d1d, 30%);
+    -fx-background-color: derive(#1A5276, 20%);
 }
 
 .result-display {
@@ -186,7 +186,7 @@
 }
 
 .context-menu {
-    -fx-background-color: derive(#1d1d1d, 50%);
+    -fx-background-color: derive(#1A5276, 50%);
 }
 
 .context-menu .label {
@@ -194,7 +194,7 @@
 }
 
 .menu-bar {
-    -fx-background-color: derive(#1d1d1d, 20%);
+    -fx-background-color: derive(#1A5276, 20%);
 }
 
 .menu-bar .label {
@@ -283,11 +283,11 @@
 }
 
 .scroll-bar {
-    -fx-background-color: derive(#1d1d1d, 20%);
+    -fx-background-color: derive(#1A5276, 20%);
 }
 
 .scroll-bar .thumb {
-    -fx-background-color: derive(#1d1d1d, 50%);
+    -fx-background-color: derive(#1A5276, 50%);
     -fx-background-insets: 3;
 }
 
@@ -319,9 +319,9 @@
 }
 
 #commandTextField {
-    -fx-background-color: transparent #383838 transparent #383838;
+    -fx-background-color: #1A5276;
     -fx-background-insets: 0;
-    -fx-border-color: #383838 #383838 #ffffff #383838;
+    -fx-border-color: #1A5276;
     -fx-border-insets: 0;
     -fx-border-width: 1;
     -fx-font-family: "Segoe UI Light";
@@ -334,7 +334,7 @@
 }
 
 #resultDisplay .content {
-    -fx-background-color: transparent, #383838, transparent, #383838;
+    -fx-background-color: #1A5276;
     -fx-background-radius: 0;
 }
 
diff --git a/src/main/resources/view/PieChartWindow.fxml b/src/main/resources/view/PieChartWindow.fxml
index b9cdcbc112c..e8068bfcfdd 100644
--- a/src/main/resources/view/PieChartWindow.fxml
+++ b/src/main/resources/view/PieChartWindow.fxml
@@ -8,9 +8,9 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.stage.Stage?>
 
-<fx:root resizable="false" title="Help" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root resizable="false" title="Statistics" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1">
     <icons>
-        <Image url="@/images/help_icon.png" />
+        <Image url="@/images/statistics.png" />
     </icons>
     <scene>
         <Scene>