From 10c8a30ce3697acbd4e688de1a9a9e4596331098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20V=C3=A9lez=20Palacios?= Date: Wed, 25 May 2016 17:59:00 +0200 Subject: [PATCH] Super commit --- .../controller/DashboardController.java | 4 + .../estraba/controller/SplashController.java | 2 +- .../es/kauron/estraba/css/estraba.css | 34 ++++++- .../es/kauron/estraba/fxml/Dashboard.fxml | 95 ++---------------- .../es/kauron/estraba/img/header.png | Bin 4936 -> 11833 bytes 5 files changed, 46 insertions(+), 89 deletions(-) diff --git a/src/main/java/es/kauron/estraba/controller/DashboardController.java b/src/main/java/es/kauron/estraba/controller/DashboardController.java index 0d729eb..9f39ea5 100644 --- a/src/main/java/es/kauron/estraba/controller/DashboardController.java +++ b/src/main/java/es/kauron/estraba/controller/DashboardController.java @@ -110,6 +110,8 @@ public class DashboardController implements Initializable, MapComponentInitializ @Override public void initialize(URL location, ResourceBundle resources) { + root.getStylesheets().add(App.class.getResource("css/estraba.css").toExternalForm()); + mapView.setVisible(false); // populate map icons ((ImageView)elevationButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/elevation.png"))); @@ -203,6 +205,8 @@ public class DashboardController implements Initializable, MapComponentInitializ cadenceChart.getData().add(bundle.cadenceSeries); cadenceTChart.getData().add(bundle.cadenceTSeries); + mapChart.setLegendVisible(true); + //initialize map chunks = bundle.chunks; mapView.addMapInializedListener(this); diff --git a/src/main/java/es/kauron/estraba/controller/SplashController.java b/src/main/java/es/kauron/estraba/controller/SplashController.java index 5509126..b6acbd9 100644 --- a/src/main/java/es/kauron/estraba/controller/SplashController.java +++ b/src/main/java/es/kauron/estraba/controller/SplashController.java @@ -154,8 +154,8 @@ public class SplashController implements Initializable{ @Override public void initialize(URL location, ResourceBundle resources) { + root.getStylesheets().add(App.class.getResource("css/estraba.css").toExternalForm()); imgLogo.setImage(new Image(App.class.getResourceAsStream("img/header.png"))); - labelWelcome.setFont(App.DAGGERSQUARE); snackbar = new JFXSnackbar(); imgLogo.setOnMouseClicked(e -> { diff --git a/src/main/resources/es/kauron/estraba/css/estraba.css b/src/main/resources/es/kauron/estraba/css/estraba.css index 77ae664..a06de5a 100644 --- a/src/main/resources/es/kauron/estraba/css/estraba.css +++ b/src/main/resources/es/kauron/estraba/css/estraba.css @@ -23,18 +23,44 @@ * */ +.root { + -fx-font: 14px "DAGGERSQUARE"; + -fx-font-family: DAGGERSQUARE; +} + .text { -fx-font-smoothing-type: lcd; } -value-minhr { +.label { +} + +.value-main { + -fx-font: 30px "DAGGERSQUARE"; +} + +.value-sub { +} + +.value-minhr { -fx-text-fill: #2aa; } -value-maxhr { +.value-maxhr { -fx-text-fill: #a22; } -value-avghr { - -fx-text-fill: #2a2 +.value-avghr { +} + +.jfx-snackbar-content { + -fx-background-color: #323232; +} + +.jfx-snackbar-toast { + -fx-text-fill: WHITE; +} + +.jfx-snackbar-action { + -fx-text-fill: #ff4081; } diff --git a/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml b/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml index 2f77892..3ea61fe 100644 --- a/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml +++ b/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml @@ -25,37 +25,23 @@ ~ --> - - - + - - - - - - - - - - - - - - - - - + + + + + + + - +