From bcd938e53eec8e9887a76507a6717a53b51b9074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Einar=20Sk=C3=B8ien?= Date: Thu, 14 May 2026 21:39:26 +0200 Subject: [PATCH] fix stylesheets not loading in previous PR --- .../java/edu/ntnu/idi/idatt2003/gruppe42/View/Popup.java | 6 +++--- .../ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java | 6 +++--- .../ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java | 4 ++-- src/main/resources/{Style => css}/apps.css | 0 src/main/resources/{Style => css}/desktop.css | 0 src/main/resources/{Style => css}/global.css | 0 src/main/resources/{Style => css}/login.css | 0 src/main/resources/{Style => css}/popup.css | 0 8 files changed, 8 insertions(+), 8 deletions(-) rename src/main/resources/{Style => css}/apps.css (100%) rename src/main/resources/{Style => css}/desktop.css (100%) rename src/main/resources/{Style => css}/global.css (100%) rename src/main/resources/{Style => css}/login.css (100%) rename src/main/resources/{Style => css}/popup.css (100%) diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popup.java index 79ac702..cc9a3b5 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popup.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popup.java @@ -118,9 +118,9 @@ private void loadStylesheets() { ); } else { root.getStylesheets().addAll( - resource("/Style/global.css"), - resource("/Style/popup.css"), - resource("/Style/apps.css") + resource("/css/global.css"), + resource("/css/popup.css"), + resource("/css/apps.css") ); } } catch (Exception e) { 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 bef9abc..642cd6c 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 @@ -112,9 +112,9 @@ private void loadStylesheets() { ); } else { root.getStylesheets().addAll( - resource("/Style/global.css"), - resource("/Style/desktop.css"), - resource("/Style/apps.css") + resource("/css/global.css"), + resource("/css/desktop.css"), + resource("/css/apps.css") ); } } catch (Exception e) { 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 8660bbc..d48e6ac 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 @@ -121,8 +121,8 @@ private void loadStylesheets() { ); } else { root.getStylesheets().addAll( - getClass().getResource("/Style/global.css").toExternalForm(), - getClass().getResource("/Style/login.css").toExternalForm() + getClass().getResource("/css/global.css").toExternalForm(), + getClass().getResource("/css/login.css").toExternalForm() ); } } catch (Exception e) { diff --git a/src/main/resources/Style/apps.css b/src/main/resources/css/apps.css similarity index 100% rename from src/main/resources/Style/apps.css rename to src/main/resources/css/apps.css diff --git a/src/main/resources/Style/desktop.css b/src/main/resources/css/desktop.css similarity index 100% rename from src/main/resources/Style/desktop.css rename to src/main/resources/css/desktop.css diff --git a/src/main/resources/Style/global.css b/src/main/resources/css/global.css similarity index 100% rename from src/main/resources/Style/global.css rename to src/main/resources/css/global.css diff --git a/src/main/resources/Style/login.css b/src/main/resources/css/login.css similarity index 100% rename from src/main/resources/Style/login.css rename to src/main/resources/css/login.css diff --git a/src/main/resources/Style/popup.css b/src/main/resources/css/popup.css similarity index 100% rename from src/main/resources/Style/popup.css rename to src/main/resources/css/popup.css