From f46f9b9bf51c6708b1a5f4af3524a8f6b947d16b Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Thu, 28 Sep 2017 14:52:30 +1300
Subject: [PATCH] Merge master in

#story[1301]
---
 .../src/main/resources/css/dayMode.css         | 10 +++++++---
 .../src/main/resources/css/keyBindings.css     |  4 ++++
 .../resources/visualiser/scenes/gameLobby.fxml | 14 ++++++--------
 .../resources/visualiser/scenes/hostGame.fxml  | 18 ++++++++----------
 .../resources/visualiser/scenes/lobby.fxml     |  7 ++++---
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/racevisionGame/src/main/resources/css/dayMode.css b/racevisionGame/src/main/resources/css/dayMode.css
index d4989fb8..1da23f42 100644
--- a/racevisionGame/src/main/resources/css/dayMode.css
+++ b/racevisionGame/src/main/resources/css/dayMode.css
@@ -2,6 +2,9 @@
     -fx-base: rgb(215, 232, 218);
     -fx-background: rgba(0, 255, 190, 0.11);
 
+    /* make controls (buttons, thumb, etc.) slightly lighter */
+    -fx-color: derive(-fx-base, 2.5%);
+
     /* text fields and table rows background */
     -fx-control-inner-background: rgb(200, 200, 200);
     /* version of -fx-control-inner-background for alternative rows */
@@ -46,12 +49,12 @@
     -fx-focus-color: transparent;
     -fx-background-color: transparent;
     -fx-text-fill: transparent;
-    -fx-border-color: rgb(10, 123, 125);
-    -fx-border-width: 2px;
+    /*-fx-border-color: rgb(10, 123, 125);*/
+    /*-fx-border-width: 2px;*/
 }
 
 /* Smaller buttons */
-#mainMenuBtn #addBtn #refreshBtn #joinGameBtn #spectateButton #quitBtn {
+#mainMenuBtn, #addBtn, #refreshBtn, #joinGameBtn, #spectateButton, #quitBtn {
     -fx-background-size: 115px;
 }
 
@@ -91,6 +94,7 @@
     }
     #mainMenuBtn {
         -fx-background-image: url("/visualiser/images/mainMenuBtn.png");
+        /*-fx-background-size: 115px;*/
     }
     #mainMenuBtn:pressed {
         -fx-background-image: url("/visualiser/images/mainMenuBtnPressed.png");
diff --git a/racevisionGame/src/main/resources/css/keyBindings.css b/racevisionGame/src/main/resources/css/keyBindings.css
index a572116e..a2118380 100644
--- a/racevisionGame/src/main/resources/css/keyBindings.css
+++ b/racevisionGame/src/main/resources/css/keyBindings.css
@@ -1,3 +1,7 @@
+.label, .list-view {
+    -fx-text-fill: black;
+}
+
 .list-view .list-cell {
     -fx-cell-size: 40;
     -fx-font-family: "Tahoma";
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
index 964b23c4..c84c16a6 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -14,9 +9,9 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" style="-fx-background-color: rgba(100, 100, 100, 0.2);" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
+<AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
     <children>
-      <GridPane style="-fx-background-color: #f1f1d4;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
             <Button fx:id="quitBtn" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#menuBtnPressed" GridPane.rowIndex="2">
                <GridPane.margin>
@@ -71,7 +66,10 @@
                   <Font name="Cabin-Bold" size="17.0" />
                </font>
             </Label>
-            <Button fx:id="startButton" disable="true" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#startBtnPressed" visible="false" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+            <Button fx:id="startButton" disable="true" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#startBtnPressed" visible="false" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+               <GridPane.margin>
+                  <Insets right="20.0" />
+               </GridPane.margin></Button>
          </children>
          <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
index 6e6b7bcf..97c1d31f 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
@@ -20,13 +20,13 @@
                 <ColumnConstraints hgrow="NEVER" prefWidth="170.0" />
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints prefHeight="50.0" vgrow="NEVER" />
-                <RowConstraints prefHeight="419.5" vgrow="NEVER" />
-            <RowConstraints prefHeight="50.0" vgrow="NEVER" />
-                <RowConstraints prefHeight="80.0" vgrow="NEVER" />
+                <RowConstraints maxHeight="118.0" minHeight="56.5" prefHeight="76.0" vgrow="NEVER" />
+                <RowConstraints maxHeight="413.5" minHeight="329.5" prefHeight="370.0" vgrow="NEVER" />
+            <RowConstraints maxHeight="76.5" minHeight="0.0" prefHeight="54.0" vgrow="NEVER" />
+                <RowConstraints maxHeight="130.0" minHeight="84.5" prefHeight="100.5" vgrow="NEVER" />
             </rowConstraints>
             <children>
-                <Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Start Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
+                <Button fx:id="hostGameBtn" maxHeight="80.0" maxWidth="200.0" mnemonicParsing="false" onAction="#hostGamePressed" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
                     <font>
                         <Font size="20.0" />
                     </font>
@@ -35,9 +35,8 @@
                     </GridPane.margin>
                 </Button>
                 <Label fx:id="title" text="Map Selection"
-                       GridPane.columnIndex="1"
-                       GridPane.halignment="CENTER"
-                       GridPane.valignment="BOTTOM">
+                       GridPane.columnIndex="1" GridPane.halignment="CENTER"
+                       GridPane.valignment="CENTER">
                 </Label>
                 <!--<Label text="Address: 127.0.0.1" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="TOP">-->
                     <!--<font>-->
@@ -49,8 +48,7 @@
                         <!--<Font size="17.0" />-->
                     <!--</font>-->
                 <!--</Label>-->
-                <Button fx:id="mainMenuBtn" mnemonicParsing="false"
-                        onAction="#menuBtnPressed" text="Main Menu" GridPane.halignment="LEFT" GridPane.valignment="TOP">
+                <Button fx:id="mainMenuBtn" maxHeight="50.0" maxWidth="125.0" minHeight="50.0" minWidth="125.0" mnemonicParsing="false" onAction="#menuBtnPressed" prefHeight="50.0" prefWidth="125.0" scaleShape="false" GridPane.halignment="LEFT" GridPane.valignment="TOP">
                     <GridPane.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                     </GridPane.margin>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
index e7c544d4..b1c050e6 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="lobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" style="-fx-background-color: #f1f1d4;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.LobbyController">
+<AnchorPane fx:id="lobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.LobbyController">
    <children>
       <GridPane fx:id="connection" prefHeight="600.0" prefWidth="780.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <columnConstraints>
@@ -36,7 +36,8 @@
                   <Insets left="50.0" right="50.0" />
                </GridPane.margin>
             </TableView>
-            <Label text="Available Games" GridPane.columnSpan="2" GridPane.halignment="CENTER">
+            <Label fx:id="title" text="Available Games"
+                   GridPane.columnSpan="2" GridPane.halignment="CENTER">
                <font>
                   <Font size="36.0" />
                </font>
@@ -93,7 +94,7 @@
                   </VBox>
                </children>
             </GridPane>
-            <Button fx:id="mainMenuBtn" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#menuBtnPressed">
+            <Button fx:id="mainMenuBtn" maxHeight="50.0" maxWidth="125.0" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#menuBtnPressed" prefHeight="50.0" prefWidth="125.0">
                <GridPane.margin>
                   <Insets left="50.0" />
                </GridPane.margin>