diff --git a/visualiser/src/main/java/seng302/App.java b/visualiser/src/main/java/seng302/App.java index 05e25566..480a7bf3 100644 --- a/visualiser/src/main/java/seng302/App.java +++ b/visualiser/src/main/java/seng302/App.java @@ -32,7 +32,7 @@ public class App extends Application { FXMLLoader loader = new FXMLLoader(getClass().getResource("/scenes/main.fxml")); Parent root = loader.load(); Scene scene = new Scene(root, 1200, 800); - scene.getStylesheets().add("/css/sail.css"); + scene.getStylesheets().add("/css/nightMode.css"); stage.setScene(scene); stage.setTitle("RaceVision - Team 7"); diff --git a/visualiser/src/main/java/seng302/Model/ResizableRaceMap.java b/visualiser/src/main/java/seng302/Model/ResizableRaceMap.java index c77ef9b6..a4285f7f 100644 --- a/visualiser/src/main/java/seng302/Model/ResizableRaceMap.java +++ b/visualiser/src/main/java/seng302/Model/ResizableRaceMap.java @@ -51,7 +51,7 @@ public class ResizableRaceMap extends ResizableCanvas { if (this.raceBoundaries == null) { return; } - gc.setFill(Color.ROYALBLUE); + gc.setFill(Color.DODGERBLUE); setRaceBoundCoordinates(); gc.setLineWidth(1); diff --git a/visualiser/src/main/resources/css/red_and_black.css b/visualiser/src/main/resources/css/dayMode.css similarity index 85% rename from visualiser/src/main/resources/css/red_and_black.css rename to visualiser/src/main/resources/css/dayMode.css index 2a1af4bf..4e8e1736 100644 --- a/visualiser/src/main/resources/css/red_and_black.css +++ b/visualiser/src/main/resources/css/dayMode.css @@ -1,14 +1,14 @@ .root { - -fx-base: rgb(212, 26, 32); - -fx-background: rgb(50, 50, 50); + -fx-base: rgb(215, 232, 218); + -fx-background: rgb(242, 242, 242); /* make controls (buttons, thumb, etc.) slightly lighter */ - -fx-color: derive(-fx-base, 10%); + -fx-color: derive(-fx-base, 2.5%); /* text fields and table rows background */ - -fx-control-inner-background: rgb(50, 50, 50); + -fx-control-inner-background: rgb(200, 200, 200); /* version of -fx-control-inner-background for alternative rows */ - -fx-control-inner-background-alt: derive(-fx-control-inner-background, 2.5%); + -fx-control-inner-background-alt: derive(-fx-control-inner-background, 10%); /* text colors depending on background's brightness */ -fx-light-text-color: rgb(220, 220, 220); @@ -16,13 +16,13 @@ -fx-dark-text-color: rgb(20, 20, 20); /*highlighting/accenting objects. */ - -fx-accent: rgb(220, 220, 220); + -fx-accent: rgb(128, 128, 128); /* color of non-focused yet selected elements */ -fx-selection-bar-non-focused: rgb(50, 50, 50); /*Focus colour*/ - -fx-focus-color: rgb(255, 255, 255); + -fx-focus-color: rgb(128, 128, 128); } /* Fix derived prompt color for text fields */ diff --git a/visualiser/src/main/resources/css/black_on_black.css b/visualiser/src/main/resources/css/nightMode.css similarity index 92% rename from visualiser/src/main/resources/css/black_on_black.css rename to visualiser/src/main/resources/css/nightMode.css index 9a925261..4844a810 100644 --- a/visualiser/src/main/resources/css/black_on_black.css +++ b/visualiser/src/main/resources/css/nightMode.css @@ -16,13 +16,13 @@ -fx-dark-text-color: rgb(20, 20, 20); /*highlighting/accenting objects. */ - -fx-accent: rgb(220, 220, 220); + -fx-accent: rgb(128, 128, 128); /* color of non-focused yet selected elements */ - -fx-selection-bar-non-focused: rgb(50, 50, 50); + -fx-selection-bar-non-focused: rgb(100, 100, 100); /*Focus colour*/ - -fx-focus-color: rgb(255, 255, 255); + -fx-focus-color: rgb(100, 100, 100); } /* Fix derived prompt color for text fields */ diff --git a/visualiser/src/main/resources/css/sail.css b/visualiser/src/main/resources/css/sail.css deleted file mode 100644 index 9a925261..00000000 --- a/visualiser/src/main/resources/css/sail.css +++ /dev/null @@ -1,53 +0,0 @@ -.root { - -fx-base: rgb(20, 20, 20); - -fx-background: rgb(50, 50, 50); - - /* make controls (buttons, thumb, etc.) slightly lighter */ - -fx-color: derive(-fx-base, 10%); - - /* text fields and table rows background */ - -fx-control-inner-background: rgb(50, 50, 50); - /* version of -fx-control-inner-background for alternative rows */ - -fx-control-inner-background-alt: derive(-fx-control-inner-background, 2.5%); - - /* text colors depending on background's brightness */ - -fx-light-text-color: rgb(220, 220, 220); - -fx-mid-text-color: rgb(100, 100, 100); - -fx-dark-text-color: rgb(20, 20, 20); - - /*highlighting/accenting objects. */ - -fx-accent: rgb(220, 220, 220); - - /* color of non-focused yet selected elements */ - -fx-selection-bar-non-focused: rgb(50, 50, 50); - - /*Focus colour*/ - -fx-focus-color: rgb(255, 255, 255); -} - -/* Fix derived prompt color for text fields */ -.text-input { - -fx-prompt-text-fill: derive(-fx-control-inner-background, +50%); - -} - -/* Keep prompt invisible when focused (above color fix overrides it) */ -.text-input:focused { - -fx-prompt-text-fill: transparent; -} - -/* Fix scroll bar buttons arrows colors */ -.scroll-bar > .increment-button > .increment-arrow, -.scroll-bar > .decrement-button > .decrement-arrow { - -fx-background-color: -fx-mark-highlight-color, rgb(255, 255, 255); -} - -.scroll-bar > .increment-button:hover > .increment-arrow, -.scroll-bar > .decrement-button:hover > .decrement-arrow { - -fx-background-color: -fx-mark-highlight-color, rgb(255, 255, 255); -} - -.scroll-bar > .increment-button:pressed > .increment-arrow, -.scroll-bar > .decrement-button:pressed > .decrement-arrow { - -fx-background-color: -fx-mark-highlight-color, rgb(255, 255, 255); -} \ No newline at end of file