Merge pull request #99 from wkurvers/master

gameview update
VictorRealem · Apr 13, 2018 · 3d2c34f · 3d2c34f
2 parents 94ee199 + 3a97556
commit 3d2c34f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/CSS/gameboard.css b/src/CSS/gameboard.css
@@ -18,9 +18,13 @@
 
 #rightPane{
 
--fx-background-color: linear-gradient(to top, #932d27, #f7483d);
+-fx-background-color: linear-gradient(to top, #7f2b26, #f7483d);
 }
 
 #centerPane{
 -fx-background-color: linear-gradient(to top, #efefef, #FAFAFA);
+}
+
+#bottomPane{
+-fx-background-color: #E8E8E8;
 }
diff --git a/src/Images/closeRed2.png b/src/Images/closeRed2.png
diff --git a/src/Views/GameBoardView.java b/src/Views/GameBoardView.java
@@ -13,6 +13,7 @@
 import javafx.scene.control.Separator;
 import javafx.scene.effect.DropShadow;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.ImagePattern;
@@ -63,11 +64,15 @@ public BottomPane() {
         setAlignment(Pos.CENTER);
         setForfeit();
         setLayout();
+        setId("bottomPane");
     }
 
     private void setForfeit() {
-        Button forfeit = new Button("Give up");
-        forfeit.setEffect(new DropShadow());
+        Button forfeit = new Button();
+        Image loginPic = new Image("/Images/closeRed2.png");
+        forfeit.setGraphic(new ImageView(loginPic));
+        forfeit.setStyle("-fx-background-color: transparent;");
+        forfeit.setPadding(new Insets(0, 0, 10, 0));
         forfeit.setOnAction((ActionEvent e) -> {
             TCPConnection connection = TCPConnection.getInstance();
             connection.sentCommand("forfeit");