diff --git a/src/main/java/seedu/address/commons/core/GuiSettings.java b/src/main/java/seedu/address/commons/core/GuiSettings.java index ba33653be67..861f3063729 100644 --- a/src/main/java/seedu/address/commons/core/GuiSettings.java +++ b/src/main/java/seedu/address/commons/core/GuiSettings.java @@ -11,7 +11,7 @@ public class GuiSettings implements Serializable { private static final double DEFAULT_HEIGHT = 600; - private static final double DEFAULT_WIDTH = 740; + private static final double DEFAULT_WIDTH = 800; private final double windowWidth; private final double windowHeight; diff --git a/src/main/java/seedu/address/ui/UiManager.java b/src/main/java/seedu/address/ui/UiManager.java index fd413ea84b1..8398e9d0c6d 100644 --- a/src/main/java/seedu/address/ui/UiManager.java +++ b/src/main/java/seedu/address/ui/UiManager.java @@ -65,7 +65,7 @@ void showAlertDialogAndWait(Alert.AlertType type, String title, String headerTex private static void showAlertDialogAndWait(Stage owner, AlertType type, String title, String headerText, String contentText) { final Alert alert = new Alert(type); - alert.getDialogPane().getStylesheets().add("view/DarkTheme.css"); + alert.getDialogPane().getStylesheets().add("view/ThemePresets.css"); alert.initOwner(owner); alert.setTitle(title); alert.setHeaderText(headerText); diff --git a/src/main/resources/view/CommandBox.fxml b/src/main/resources/view/CommandBox.fxml index 09f6d6fe9e4..f271f03465c 100644 --- a/src/main/resources/view/CommandBox.fxml +++ b/src/main/resources/view/CommandBox.fxml @@ -3,7 +3,6 @@ - - + + - diff --git a/src/main/resources/view/HelpWindow.css b/src/main/resources/view/HelpWindow.css index 17e8a8722cd..bb3ddda2977 100644 --- a/src/main/resources/view/HelpWindow.css +++ b/src/main/resources/view/HelpWindow.css @@ -1,5 +1,6 @@ #copyButton, #helpMessage { -fx-text-fill: white; + -fx-font-family: "Verdana"; } #copyButton { @@ -15,5 +16,5 @@ } #helpMessageContainer { - -fx-background-color: derive(#1d1d1d, 20%); + -fx-background-color: derive(#1d1d1d, -10%); } diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml index 5c6a15b78eb..af9f884c31d 100644 --- a/src/main/resources/view/MainWindow.fxml +++ b/src/main/resources/view/MainWindow.fxml @@ -6,24 +6,25 @@ + - + - + - - + + @@ -32,31 +33,34 @@ - - - - - - - - - - - - + - + + + + + + + + + + + + + + + diff --git a/src/main/resources/view/TaskCard.fxml b/src/main/resources/view/TaskCard.fxml index e482482afe2..3e778e53c7a 100644 --- a/src/main/resources/view/TaskCard.fxml +++ b/src/main/resources/view/TaskCard.fxml @@ -20,7 +20,6 @@ diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/ThemePresets.css similarity index 78% rename from src/main/resources/view/DarkTheme.css rename to src/main/resources/view/ThemePresets.css index 36e6b001cd8..fd914a83824 100644 --- a/src/main/resources/view/DarkTheme.css +++ b/src/main/resources/view/ThemePresets.css @@ -1,5 +1,5 @@ .background { - -fx-background-color: derive(#1d1d1d, 20%); + -fx-background-color: derive(#fffff0, 20%); background-color: #383838; /* Used in the default.html file */ } @@ -40,9 +40,9 @@ } .table-view { - -fx-base: #1d1d1d; - -fx-control-inner-background: #1d1d1d; - -fx-background-color: #1d1d1d; + -fx-base: #f0ffff; + -fx-control-inner-background: #f0ffff; + -fx-background-color: #f0ffff; -fx-table-cell-border-color: transparent; -fx-table-header-border-color: transparent; -fx-padding: 5; @@ -77,47 +77,50 @@ } .split-pane:horizontal .split-pane-divider { - -fx-background-color: derive(#1d1d1d, 20%); - -fx-border-color: transparent transparent transparent #4d4d4d; + -fx-background-color: derive(#f0ffff, 20%); + -fx-border-color: derive(#f0ffff, 20%); } .split-pane { - -fx-border-radius: 1; -fx-border-width: 1; - -fx-background-color: derive(#1d1d1d, 20%); + -fx-background-color: derive(#f0ffff, 20%); } .list-view { -fx-background-insets: 0; -fx-padding: 0; - -fx-background-color: derive(#1d1d1d, 20%); + -fx-background-color: derive(#f0ffff, 20%); } .list-cell { -fx-label-padding: 0 0 0 0; -fx-graphic-text-gap : 0; - -fx-padding: 0 0 0 0; + -fx-background-insets: 3px; + -fx-background-radius: 15; } .list-cell:filled:even { - -fx-background-color: #3c3e3f; + -fx-background-color: #e8eaf6; } .list-cell:filled:odd { - -fx-background-color: #515658; + -fx-background-color: #dadef1; } .list-cell:filled:selected { - -fx-background-color: #424d5f; + -fx-background-color: #d2d4e0; } .list-cell:filled:selected #cardPane { + -fx-label-padding: 0 0 0 0; -fx-border-color: #3e7b91; -fx-border-width: 1; + -fx-background-insets: 3px; + -fx-border-radius: 15; } .list-cell .label { - -fx-text-fill: white; + -fx-text-fill: black; } .cell_big_label { @@ -133,24 +136,25 @@ } .stack-pane { - -fx-background-color: derive(#1d1d1d, 20%); + -fx-background-color: derive(#f0ffff, 20%); + -fx-border-color: derive(#1d1d1d, 40%); } .pane-with-border { - -fx-background-color: derive(#1d1d1d, 20%); - -fx-border-color: derive(#1d1d1d, 10%); + -fx-background-color: derive(#fffff0, 20%); + -fx-border-color: derive(#1d1d1d, -10%); -fx-border-top-width: 1px; } .status-bar { - -fx-background-color: derive(#1d1d1d, 30%); + -fx-background-color: #c9f1fd; } .result-display { - -fx-background-color: transparent; + -fx-background-color: derive(#fffff0, 20%); -fx-font-family: "Segoe UI Light"; -fx-font-size: 13pt; - -fx-text-fill: white; + -fx-text-fill: black; } .result-display .label { @@ -159,7 +163,7 @@ .status-bar .label { -fx-font-family: "Segoe UI Light"; - -fx-text-fill: white; + -fx-text-fill: black; -fx-padding: 4px; -fx-pref-height: 30px; } @@ -181,11 +185,11 @@ } .grid-pane .stack-pane { - -fx-background-color: derive(#1d1d1d, 30%); + -fx-background-color: derive(#fffff0, 30%); } .context-menu { - -fx-background-color: derive(#1d1d1d, 50%); + -fx-background-color: derive(#fffff0, 30%); } .context-menu .label { @@ -199,14 +203,24 @@ .menu-bar .label { -fx-font-size: 14pt; -fx-font-family: "Segoe UI Light"; - -fx-text-fill: white; + -fx-text-fill: black; -fx-opacity: 0.9; } .menu .left-container { - -fx-background-color: black; + -fx-background-color: #c9f1fd; } +.menu-item .label{ + -fx-background-color: #c9f1fd; + -fx-text-fill: black; +} + +.context-menu { + -fx-background-color: #c9f1fd; + -fx-border-color: #1d1d1d; + -fx-border-width: 1; +} /* * Metro style Push Button * Author: Pedro Duque Vieira @@ -267,11 +281,11 @@ .dialog-pane > *.label.content { -fx-font-size: 14px; -fx-font-weight: bold; - -fx-text-fill: white; + -fx-text-fill: black; } .dialog-pane:header *.header-panel { - -fx-background-color: derive(#1d1d1d, 25%); + -fx-background-color: derive(#f0ffff, 20%); } .dialog-pane:header *.header-panel *.label { @@ -282,12 +296,15 @@ } .scroll-bar { - -fx-background-color: derive(#1d1d1d, 20%); + -fx-background-color: derive(#e6e6e7, 20%); } .scroll-bar .thumb { - -fx-background-color: derive(#1d1d1d, 50%); + -fx-background-color: #e6e6e7; -fx-background-insets: 3; + -fx-border-color: #2d4b5a; + -fx-background-radius : 1em; + -fx-border-radius: 1em; } .scroll-bar .increment-button, .scroll-bar .decrement-button { @@ -318,6 +335,7 @@ } #commandTextField { + -fx-prompt-text-fill: black; -fx-background-color: transparent #383838 transparent #383838; -fx-background-insets: 0; -fx-border-color: #383838 #383838 #ffffff #383838; @@ -325,7 +343,7 @@ -fx-border-width: 1; -fx-font-family: "Segoe UI Light"; -fx-font-size: 13pt; - -fx-text-fill: white; + -fx-text-fill: black; } #filterField, #personListPanel, #personWebpage { @@ -333,7 +351,7 @@ } #resultDisplay .content { - -fx-background-color: transparent, #383838, transparent, #383838; + -fx-background-color: derive(#f0ffff, 20%); -fx-background-radius: 0; }