Merge pull request #161 from yyutong/branch-update-ui

update ui
AY2021S1-CS2103T-W10-1 · Oct 29, 2020 · c1798d5 · c1798d5
2 parents b650d59 + 096e382
commit c1798d5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git 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
diff --git 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(#FFC0CB, 20%);
-     -fx-border-color: derive(#FFC0CB, 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,15 +186,15 @@
 }
 
 .context-menu {
-    -fx-background-color: derive(#1d1d1d, 50%);
+    -fx-background-color: derive(#1A5276, 50%);
 }
 
 .context-menu .label {
     -fx-text-fill: white;
 }
 
 .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
@@ -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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,7 @@ public void setStats() { @@
                 PIECHART.setTitle("Statistics of Expense Book");
                 PIECHART.setClockwise(false);
                 PIECHART.setLabelsVisible(true);
             }
         }
@@ Expand Down @@