Merge branch 'master' into story_64_sails

# Conflicts: # racevisionGame/src/main/java/visualiser/gameController/Keys/ControlKey.java # racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java # racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java # racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
2017-08-10 08:58:43 +12:00
parent ce973fecfe 568458aca4
commit 41d09f587e
24 changed files with 661 additions and 586 deletions
@@ -50,4 +50,6 @@
 .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);
-}
+}
+
+
@@ -51,4 +51,9 @@
 .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);
-}
+}
+
+
+#arrowImage {
+    -fx-image: url("/visualiser/images/arrowLight.png");
+}