From 7b12642a664cb90c0b417c62ded0b1d9a30a4d8f Mon Sep 17 00:00:00 2001 From: Marc Beyer Date: Wed, 17 Nov 2021 21:27:01 +0100 Subject: [PATCH 1/5] Updated .gitignore ignore all ".gradle" and "build" folder --- .gitignore | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4e3b8a6..f0ded7c 100644 --- a/.gitignore +++ b/.gitignore @@ -70,7 +70,5 @@ crashlytics-build.properties # by github https://github.com/github/gitignore/blob/master/Java.gitignore -hellofx/.gradle/ -hellofx/app/build/ -hellofx/data/build/ -hellofx/.gradle/buildOutputCleanup/ \ No newline at end of file +.gradle/ +build/ From af3ffe807cda7758e5ff68dd30b71613fbf20cab Mon Sep 17 00:00:00 2001 From: Marc Beyer Date: Wed, 17 Nov 2021 21:32:04 +0100 Subject: [PATCH 2/5] removed buildfile --- hellofx/app/build/resources/main/client/style.css | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 hellofx/app/build/resources/main/client/style.css diff --git a/hellofx/app/build/resources/main/client/style.css b/hellofx/app/build/resources/main/client/style.css deleted file mode 100644 index c650c9f..0000000 --- a/hellofx/app/build/resources/main/client/style.css +++ /dev/null @@ -1,13 +0,0 @@ -GridPane{ - -fx-background-color: #282C34; -} - -.main-btn{ - -fx-background-color: #ffffff; - -fx-text-fill: white; - -fx-background-radius: 5em; - -fx-min-width: 40px; - -fx-min-height: 40px; - -fx-max-width: 40px; - -fx-max-height: 40px; -} \ No newline at end of file From 18d5b528af301692ea0ee62e6661a3a16ee06406 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 22 Nov 2021 13:37:46 +0100 Subject: [PATCH 3/5] added class vbox-main and main- pannel in the css --- hellofx/app/src/main/resources/client/style.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hellofx/app/src/main/resources/client/style.css b/hellofx/app/src/main/resources/client/style.css index 626bad8..f85a748 100644 --- a/hellofx/app/src/main/resources/client/style.css +++ b/hellofx/app/src/main/resources/client/style.css @@ -1,7 +1,13 @@ -GridPane{ +.main-panel{ -fx-background-color: #282C34; } +.vbox-main{ + -fx-background-color: #333333; + -fx-alignment: top-center; + +} + Label{ -fx-text-fill: white; } @@ -14,4 +20,5 @@ Label{ -fx-min-height: 40px; -fx-max-width: 40px; -fx-max-height: 40px; -} \ No newline at end of file +} + From 842a83af3bf33b1c79a5c47975d4dd1df93b768a Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Thu, 25 Nov 2021 14:47:25 +0100 Subject: [PATCH 4/5] changed the main view and the style.css --- .../src/main/resources/client/main-view.fxml | 141 ++++++++---------- .../app/src/main/resources/client/style.css | 19 +++ 2 files changed, 83 insertions(+), 77 deletions(-) diff --git a/hellofx/app/src/main/resources/client/main-view.fxml b/hellofx/app/src/main/resources/client/main-view.fxml index 7017cd2..af0d08c 100644 --- a/hellofx/app/src/main/resources/client/main-view.fxml +++ b/hellofx/app/src/main/resources/client/main-view.fxml @@ -5,7 +5,7 @@ - + @@ -27,91 +27,78 @@ ADD - + - - - - - - - + + - - - + + - diff --git a/hellofx/app/src/main/resources/client/style.css b/hellofx/app/src/main/resources/client/style.css index f85a748..d1350a1 100644 --- a/hellofx/app/src/main/resources/client/style.css +++ b/hellofx/app/src/main/resources/client/style.css @@ -8,6 +8,25 @@ } +.gridCalendar Line{ + -fx-stroke: white; +} + +.gridCalender{ + -fx-min-height: 80px; + -fx-max-height: 80px; +} + +.labelMonth{ + -fx-font-size: 35px; + -fx-font-weight: bold; +} + +.labelDays{ + -fx-background-color: #525E74; + -fx-font-size: 30px; +} + Label{ -fx-text-fill: white; } From 6a40ebfcfc1b8b91f021ae7939c4c12725dac3a8 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Fri, 26 Nov 2021 13:01:08 +0100 Subject: [PATCH 5/5] improved the main view and the main-view.css --- .../src/main/java/client/MainApplication.java | 2 +- .../client/{style.css => main-view.css} | 12 +++++++-- .../src/main/resources/client/main-view.fxml | 26 +++++++++---------- 3 files changed, 24 insertions(+), 16 deletions(-) rename hellofx/app/src/main/resources/client/{style.css => main-view.css} (72%) diff --git a/hellofx/app/src/main/java/client/MainApplication.java b/hellofx/app/src/main/java/client/MainApplication.java index 777917d..c8a16a4 100644 --- a/hellofx/app/src/main/java/client/MainApplication.java +++ b/hellofx/app/src/main/java/client/MainApplication.java @@ -13,7 +13,7 @@ public class MainApplication extends Application { public void start(Stage stage) throws IOException { FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml")); Scene scene = new Scene(fxmlLoader.load(), 1200, 700); - scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("style.css")).toExternalForm()); + scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm()); stage.setTitle("Hello!"); stage.setScene(scene); stage.show(); diff --git a/hellofx/app/src/main/resources/client/style.css b/hellofx/app/src/main/resources/client/main-view.css similarity index 72% rename from hellofx/app/src/main/resources/client/style.css rename to hellofx/app/src/main/resources/client/main-view.css index d1350a1..17c4490 100644 --- a/hellofx/app/src/main/resources/client/style.css +++ b/hellofx/app/src/main/resources/client/main-view.css @@ -1,3 +1,7 @@ +GridPane{ + -fx-background-color: #2B2D42; +} + .main-panel{ -fx-background-color: #282C34; } @@ -9,22 +13,26 @@ } .gridCalendar Line{ - -fx-stroke: white; + -fx-stroke: #B0B0B0; } .gridCalender{ + -fx-background-color: #2B2D42; -fx-min-height: 80px; -fx-max-height: 80px; } .labelMonth{ + -fx-padding: 0 0 0 20; + -fx-background-color: #77859E; -fx-font-size: 35px; -fx-font-weight: bold; } .labelDays{ + -fx-alignment: center; -fx-background-color: #525E74; - -fx-font-size: 30px; + -fx-font-size: 25px; } Label{ diff --git a/hellofx/app/src/main/resources/client/main-view.fxml b/hellofx/app/src/main/resources/client/main-view.fxml index af0d08c..9614bad 100644 --- a/hellofx/app/src/main/resources/client/main-view.fxml +++ b/hellofx/app/src/main/resources/client/main-view.fxml @@ -5,7 +5,7 @@ - + @@ -13,7 +13,7 @@ - + @@ -34,18 +34,18 @@ - + -