michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into story33_add_estimated_time_annotation

Browse Source 
# Conflicts:
#	src/main/java/seng302/controllers/RaceViewController.java
This commit is contained in:
Zhi You Tan
2017-05-15 10:19:58 +12:00
parent 1ab6351d48 85d4d63287
commit 04b105d74b
7 changed files with 217 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/MainView.fxml
+1 -1
View File
@@ -57,7 +57,7 @@
<Insets top="10.0" />
</GridPane.margin>
</TableView>
<Label fx:id="realTime" text="Local time" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="BOTTOM" />
<Label fx:id="realTime" text="Local time" textFill="WHITE" visible="false" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="BOTTOM" />
</children>
</GridPane>
</children>