diff --git a/src/main/resources/com.application/CSS/styleSheet.css b/src/main/resources/com.application/CSS/styleSheet.css index f95efaf47429d7238eb86e9194f6351b2c835be6..d64d35afaa688e54c5fe788229ff129fa261e341 100644 --- a/src/main/resources/com.application/CSS/styleSheet.css +++ b/src/main/resources/com.application/CSS/styleSheet.css @@ -63,9 +63,6 @@ -fx-pref-height: 25; -fx-font-size: 20; -fx-font-family: Arial; -/* -fx-background-color: rgba(104, 229, 59, 1); - - */ -fx-background-color: rgba(12, 76, 81, 1); -fx-text-fill: white; } diff --git a/target/classes/com.application/CSS/circleprogress.css b/target/classes/com.application/CSS/circleprogress.css index 09310043981aeeef6415816f2406617756064cd2..c2d6cdf5bfd74ac9894865cc0b58a08f2c93bfe4 100644 --- a/target/classes/com.application/CSS/circleprogress.css +++ b/target/classes/com.application/CSS/circleprogress.css @@ -1,5 +1,5 @@ .circleindicator-container { - circleindicator-color: red; + circleindicator-color: rgba(94, 33, 27, 1); -fx-padding: 5.0; -fx-background-color: -fx-background; } diff --git a/target/classes/com.application/CSS/ringprogress.css b/target/classes/com.application/CSS/ringprogress.css index 10df8a25965ca69d6c4c5ce4c6b821d6aafd5cc3..f48836d2af7fa084aaa96b925b0534e31a622b8d 100644 --- a/target/classes/com.application/CSS/ringprogress.css +++ b/target/classes/com.application/CSS/ringprogress.css @@ -3,8 +3,9 @@ -fx-inner-radius: 60.0; } .ringindicator-inner-circle { - -fx-opacity: 0.55; - -fx-stroke: circleindicator-color; + -fx-opacity: 1.0; + + -fx-stroke: rgba(94, 33, 27, 1); -fx-stroke-width: 8.0px; -fx-fill: -fx-background; } @@ -20,6 +21,6 @@ -fx-fill: -fx-background; } .indeterminate { - -fx-opacity: 0.55; + -fx-opacity: 1.0; -fx-stroke: linear-gradient(from 0.0% 0.0% to 70.0% 70.0%, circleindicator-color 70.0%, white 75.0%, white); } diff --git a/target/classes/com.application/CSS/styleSheet.css b/target/classes/com.application/CSS/styleSheet.css index 8abb7ab64398941b584a1d680d0a1cd687ec478e..d64d35afaa688e54c5fe788229ff129fa261e341 100644 --- a/target/classes/com.application/CSS/styleSheet.css +++ b/target/classes/com.application/CSS/styleSheet.css @@ -51,6 +51,8 @@ -fx-pref-height: 25; -fx-font-size: 16; -fx-font-weight: 200; + -fx-background-color: rgba(12, 76, 81, 1); + -fx-text-fill: white; -fx-font-family: Arial; } @@ -61,7 +63,8 @@ -fx-pref-height: 25; -fx-font-size: 20; -fx-font-family: Arial; - -fx-background-color: rgba(104, 229, 59, 1); + -fx-background-color: rgba(12, 76, 81, 1); + -fx-text-fill: white; } #sideBarButtonExit { @@ -71,7 +74,12 @@ -fx-pref-height: 25; -fx-font-size: 20; -fx-font-family: Arial; +/* -fx-background-color: Red; + + -fx-text-fill: white; +*/ + -fx-background-color: rgba(94, 33, 27, 1); -fx-text-fill: white; } diff --git a/target/classes/com.application/GUI/graphStyles.css b/target/classes/com.application/GUI/graphStyles.css index 2edbaf26f089d1c05e9c8d379d99545bb175f460..180fa620219965fa082a5425795295009a138458 100644 --- a/target/classes/com.application/GUI/graphStyles.css +++ b/target/classes/com.application/GUI/graphStyles.css @@ -10,19 +10,19 @@ } .default-color0.chart-earlier-data-line{-fx-stroke: black; -fx-opacity: 1.0} -.default-color1.chart-series-line{-fx-stroke: green; -fx-opacity: 1.0} -.default-color2.chart-series-line{-fx-stroke: red; -fx-opacity: 0.1} -.default-color3.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color4.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color5.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color6.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color7.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color1.chart-series-line{-fx-stroke: rgba(85,198,229,0.3); -fx-opacity: 1.0} +.default-color2.chart-series-line{-fx-stroke: rgba(94, 33, 27, 1); -fx-opacity: 0.1} +.default-color3.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1} +.default-color4.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1} +.default-color5.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1} +.default-color6.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1} +.default-color7.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1} .default-color0.chart-line-symbol{-fx-background-color: black,white;} -.default-color1.chart-line-symbol{-fx-background-color: green,green;} -.default-color2.chart-line-symbol{-fx-background-color: red,red;} -.default-color3.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} -.default-color4.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} -.default-color5.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} -.default-color6.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} -.default-color7.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} +.default-color1.chart-line-symbol{-fx-background-color: rgba(85,198,229,0.3),rgba(85,198,229,0.3);} +.default-color2.chart-line-symbol{-fx-background-color: rgba(94, 33, 27, 1),rgba(94, 33, 27, 1);} +.default-color3.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);} +.default-color4.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);} +.default-color5.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);} +.default-color6.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);} +.default-color7.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);} diff --git a/target/classes/com/application/DB/Settings.class b/target/classes/com/application/DB/Settings.class index c10b0728d7fa140d9da7a00434929e80fbf5f2ea..11c74e1770b4ec970e9fab118316e9a475a22fa4 100644 Binary files a/target/classes/com/application/DB/Settings.class and b/target/classes/com/application/DB/Settings.class differ diff --git a/target/classes/com/application/GUI/Panes/CreateSideBar$1WorkerThread.class b/target/classes/com/application/GUI/Panes/CreateSideBar$1WorkerThread.class index 57e8f5067e5f4feac3e8ec82c84fd51808f6f319..1c4762d467e67e469a7eace70195ca0bcf96ca45 100644 Binary files a/target/classes/com/application/GUI/Panes/CreateSideBar$1WorkerThread.class and b/target/classes/com/application/GUI/Panes/CreateSideBar$1WorkerThread.class differ diff --git a/target/classes/com/application/GUI/Panes/CreateSideBar.class b/target/classes/com/application/GUI/Panes/CreateSideBar.class index 419cf4c1721a01ed0eec18ff080a093f4c02ccf2..26d0b938bb9c2378c6bac3d61839fd7c708458af 100644 Binary files a/target/classes/com/application/GUI/Panes/CreateSideBar.class and b/target/classes/com/application/GUI/Panes/CreateSideBar.class differ diff --git a/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class b/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class index 354c030e4cdaf8b97bc3827211c20cdf6135e268..19715f0e293043d1ef3fbf45b4642726e97bca2d 100644 Binary files a/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class and b/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class differ diff --git a/target/classes/com/application/GUI/PopUpWindows/NotificationPopUp.class b/target/classes/com/application/GUI/PopUpWindows/NotificationPopUp.class index 85c44a9dff6feda3f064bd8f59114e7ffe943ff8..46fddb3bb686ed5a92fd6e5aad2e1355fefd9ccb 100644 Binary files a/target/classes/com/application/GUI/PopUpWindows/NotificationPopUp.class and b/target/classes/com/application/GUI/PopUpWindows/NotificationPopUp.class differ diff --git a/target/test-classes/com/application/DB/DBTest.class b/target/test-classes/com/application/DB/DBTest.class index cbb5025b0dd86ce26f2b24da36100f02f10da802..aa04287de71661e45d100281735b689c241400f1 100644 Binary files a/target/test-classes/com/application/DB/DBTest.class and b/target/test-classes/com/application/DB/DBTest.class differ