diff --git a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java
index babaed4..1609f5b 100644
--- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java
+++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java
@@ -7,6 +7,7 @@ import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
import javafx.scene.control.Slider;
import javafx.scene.layout.AnchorPane;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ public class CalculatorController {
@FXML
private AnchorPane getStartedPane;
@FXML
- private AnchorPane travelPane;
+ private ScrollPane travelPane;
@FXML
private AnchorPane homePane;
@FXML
@@ -47,6 +48,8 @@ public class CalculatorController {
private Label annualIncomeLabel;
@FXML
private Button saveButton;
+ @FXML
+ private Button getStartedNextButton;
public void initialize() {
peopleInHouseholdSLider.setSnapToTicks(true);
diff --git a/src/Client/src/main/resources/fxml/calculator.fxml b/src/Client/src/main/resources/fxml/calculator.fxml
index 29e3693..e4b7627 100644
--- a/src/Client/src/main/resources/fxml/calculator.fxml
+++ b/src/Client/src/main/resources/fxml/calculator.fxml
@@ -14,7 +14,7 @@
-
@@ -132,8 +135,9 @@
+
-
+
diff --git a/src/Client/src/main/resources/stylesheets/calculatorStyle.css b/src/Client/src/main/resources/stylesheets/calculatorStyle.css
index 43b0e33..af59819 100644
--- a/src/Client/src/main/resources/stylesheets/calculatorStyle.css
+++ b/src/Client/src/main/resources/stylesheets/calculatorStyle.css
@@ -1,27 +1,28 @@
-/*#calculatorShoppingButton:hover {*/
- /*-fx-background-color: red;*/
-/*}*/
-/*#calculatorGetStartedButton:pressed {*/
- /*-fx-background-color: red;*/
- /*-fx-border-color: #677069;*/
-/*}*/
-#calculatorTabs .button {
+#calculatorTabs .navButton {
-fx-background-color: transparent;
+ -fx-font-size: 16px;
}
-#calculatorTabs .button:pressed {
+#calculatorTabs .navButton:pressed {
-fx-border-color: #677069;
}
-#calculatorTabs .button:hover {
+#calculatorTabs .navButton:hover {
-fx-background-color: #707a72;
}
#calculatorTabs #saveButton {
-fx-background-color: #89a888;
+ -fx-font-size: 16px;
+ -fx-font-weight: regular;
}
-.root {
+.nextButton {
+ -fx-background-color: #89a888;
+ -fx-font-size: 16px;
-fx-font-family: Corbel;
}
+.nextButton:hover {
+ -fx-background-color: #9ec19c;
+}
.slider {
-show-value-on-interaction: true;
@@ -30,3 +31,5 @@
+
+