diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java index a43361c..9bf3e5c 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java @@ -62,32 +62,7 @@ public BorderPane getRoot() { root.getStylesheets().add(getClass().getResource("/css/global.css").toExternalForm()); root.getStylesheets().add(getClass().getResource("/css/desktop.css").toExternalForm()); root.getStylesheets().add(getClass().getResource("/css/apps.css").toExternalForm()); - - Image backgroundImage = new Image( - Objects.requireNonNull(getClass().getResourceAsStream("/Images/mac_home_background.jpg")), - 1920, 1080, - true, // preserve aspect ratio - true // smooth scaling - ); - - // Configure background to cover the full container without tiling - BackgroundSize backgroundSize = new BackgroundSize( - BackgroundSize.AUTO, BackgroundSize.AUTO, - false, - false, - false, - true - ); - - BackgroundImage background = new BackgroundImage( - backgroundImage, - BackgroundRepeat.NO_REPEAT, - BackgroundRepeat.NO_REPEAT, - BackgroundPosition.CENTER, - backgroundSize - ); - - root.setBackground(new Background(background)); + root.getStyleClass().add("desktop-root"); return root; } diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java index be45187..ac72838 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java @@ -30,17 +30,6 @@ public class StartView { public StackPane getRoot() { StackPane root = new StackPane(); - // Background image - Image backgroundImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/Images/windows7_login_background.jpg")), 1920, 1080, true, true); - BackgroundImage background = new BackgroundImage( - backgroundImage, - BackgroundRepeat.NO_REPEAT, - BackgroundRepeat.NO_REPEAT, - BackgroundPosition.CENTER, - new BackgroundSize(BackgroundSize.AUTO, BackgroundSize.AUTO, false, false, true, true) - ); - root.setBackground(new Background(background)); - // User input content VBox loginContainer = new VBox(20); loginContainer.setAlignment(Pos.CENTER); diff --git a/src/main/resources/Images/mac_home_background.jpg b/src/main/resources/Images/mac_home_background.jpg deleted file mode 100644 index 73d60c5..0000000 Binary files a/src/main/resources/Images/mac_home_background.jpg and /dev/null differ diff --git a/src/main/resources/Sounds/confirm_transaction.wav b/src/main/resources/Sounds/confirm_transaction.wav new file mode 100644 index 0000000..e2a16df Binary files /dev/null and b/src/main/resources/Sounds/confirm_transaction.wav differ diff --git a/src/main/resources/Sounds/mouse_click.wav b/src/main/resources/Sounds/mouse_click.wav new file mode 100644 index 0000000..848eb7a Binary files /dev/null and b/src/main/resources/Sounds/mouse_click.wav differ diff --git a/src/main/resources/css/desktop.css b/src/main/resources/css/desktop.css index 5a23d3e..a079cc7 100644 --- a/src/main/resources/css/desktop.css +++ b/src/main/resources/css/desktop.css @@ -1,3 +1,7 @@ +.desktop-root { + -fx-background-color: linear-gradient(#263B6A, #6984A9); +} + .desktop-bottom-bar { -fx-background-color: rgba(0, 0, 0, 0.7); -fx-background-radius: 0; diff --git a/src/main/resources/css/login.css b/src/main/resources/css/login.css index b890f81..5c7e283 100644 --- a/src/main/resources/css/login.css +++ b/src/main/resources/css/login.css @@ -1,5 +1,6 @@ .login-root { -fx-font-family: "Segoe UI", system-ui, -apple-system, sans-serif; + -fx-background-color: linear-gradient(#FF9D23, #EA5252); } .login-container {