diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/MainController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/MainController.java index e712fe5..30110e8 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/MainController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/MainController.java @@ -4,9 +4,14 @@ package meerkat.voting.gui.controllersFX; * Created by Laura on 12/16/2016. */ import javafx.fxml.FXML; +import javafx.geometry.Insets; import javafx.scene.Node; import javafx.scene.Parent; +import javafx.scene.layout.Background; +import javafx.scene.layout.BackgroundFill; +import javafx.scene.layout.CornerRadii; import javafx.scene.layout.StackPane; +import javafx.scene.paint.Color; import meerkat.protobuf.Voting; import meerkat.voting.controller.callbacks.VoterCancelThrowable; import meerkat.voting.gui.ui.CommandPend; @@ -38,6 +43,7 @@ public class MainController { * @param node the vista node to be swapped in. */ public void setVista(Node node) { +// vistaHolder.setBackground(new Background(new BackgroundFill(Color.web("#D1B6E1"), CornerRadii.EMPTY, Insets.EMPTY))); vistaHolder.getChildren().setAll(node); } diff --git a/voting-booth-gui/src/main/resources/views/main.fxml b/voting-booth-gui/src/main/resources/views/main.fxml index 049ee8a..591b18f 100644 --- a/voting-booth-gui/src/main/resources/views/main.fxml +++ b/voting-booth-gui/src/main/resources/views/main.fxml @@ -6,7 +6,7 @@ - + diff --git a/voting-booth-gui/src/main/resources/views/welcome_screen.fxml b/voting-booth-gui/src/main/resources/views/welcome_screen.fxml index 761a6e4..93b2cf1 100644 --- a/voting-booth-gui/src/main/resources/views/welcome_screen.fxml +++ b/voting-booth-gui/src/main/resources/views/welcome_screen.fxml @@ -2,14 +2,15 @@ - + - + + - + @@ -29,4 +30,4 @@ - +