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/ 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/main-view.css b/hellofx/app/src/main/resources/client/main-view.css new file mode 100644 index 0000000..17c4490 --- /dev/null +++ b/hellofx/app/src/main/resources/client/main-view.css @@ -0,0 +1,51 @@ +GridPane{ + -fx-background-color: #2B2D42; +} + +.main-panel{ + -fx-background-color: #282C34; +} + +.vbox-main{ + -fx-background-color: #333333; + -fx-alignment: top-center; + +} + +.gridCalendar Line{ + -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: 25px; +} + +Label{ + -fx-text-fill: white; +} + +.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; +} + diff --git a/hellofx/app/src/main/resources/client/main-view.fxml b/hellofx/app/src/main/resources/client/main-view.fxml index 7017cd2..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 @@ - + @@ -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 deleted file mode 100644 index 8c5bd55..0000000 --- a/hellofx/app/src/main/resources/client/style.css +++ /dev/null @@ -1,18 +0,0 @@ -GridPane{ - -fx-background-color: #282C34; - -fx-margin: 10px; -} - -Label{ - -fx-text-fill: white; -} - -.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