From 1d70eecbb7603a2496fb3501f79c9b9ffe0aa977 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Fri, 20 May 2022 11:24:51 +0200 Subject: [PATCH] added title-logo file and rearranged files --- src/main/resources/css/dark_theme.css | 12 ------------ src/main/resources/css/light_theme.css | 12 +----------- src/main/resources/fxml/addvault_welcome.fxml | 2 +- src/main/resources/fxml/health_start.fxml | 2 +- src/main/resources/fxml/main_window_title.fxml | 6 +++++- src/main/resources/fxml/preferences_about.fxml | 2 +- .../resources/fxml/vault_detail_welcome.fxml | 2 +- src/main/resources/img/logo.png | Bin 0 -> 8508 bytes src/main/resources/img/logo@2x.png | Bin 0 -> 17867 bytes src/main/resources/img/title-logo.png | Bin 0 -> 623 bytes src/main/resources/img/title-logo@2x.png | Bin 0 -> 1046 bytes 11 files changed, 10 insertions(+), 28 deletions(-) create mode 100644 src/main/resources/img/logo.png create mode 100644 src/main/resources/img/logo@2x.png create mode 100644 src/main/resources/img/title-logo.png create mode 100644 src/main/resources/img/title-logo@2x.png diff --git a/src/main/resources/css/dark_theme.css b/src/main/resources/css/dark_theme.css index a00e46845..0263895a0 100644 --- a/src/main/resources/css/dark_theme.css +++ b/src/main/resources/css/dark_theme.css @@ -16,10 +16,6 @@ src: url('opensans-bold.ttf'); } -@font-face { - src: url('quicksand-bold.ttf'); -} - /******************************************************************************* * * * Root Styling & Colors * @@ -179,14 +175,6 @@ -fx-background-insets: 0, 0 0 1px 0; } -.main-window .title .label { - -fx-font-family: 'Quicksand'; - -fx-font-size: 16px; - -fx-font-style: normal; - -fx-font-weight: 700; - -fx-text-fill: TITLE_TEXT_FILL; -} - .main-window .title .button { -fx-pref-height: 30px; -fx-pref-width: 30px; diff --git a/src/main/resources/css/light_theme.css b/src/main/resources/css/light_theme.css index 09c743705..65460e7d6 100644 --- a/src/main/resources/css/light_theme.css +++ b/src/main/resources/css/light_theme.css @@ -16,9 +16,7 @@ src: url('opensans-bold.ttf'); } -@font-face { - src: url('quicksand-bold.ttf'); -} + /******************************************************************************* * * @@ -178,14 +176,6 @@ -fx-background-color: TITLE_BG; } -.main-window .title .label { - -fx-font-family: 'Quicksand'; - -fx-font-size: 16px; - -fx-font-style: normal; - -fx-font-weight: 700; - -fx-text-fill: TITLE_TEXT_FILL; -} - .main-window .title .button { -fx-pref-height: 30px; -fx-pref-width: 30px; diff --git a/src/main/resources/fxml/addvault_welcome.fxml b/src/main/resources/fxml/addvault_welcome.fxml index 7d7244973..d86162020 100644 --- a/src/main/resources/fxml/addvault_welcome.fxml +++ b/src/main/resources/fxml/addvault_welcome.fxml @@ -21,7 +21,7 @@ - + diff --git a/src/main/resources/fxml/health_start.fxml b/src/main/resources/fxml/health_start.fxml index a23eda414..00bb69207 100644 --- a/src/main/resources/fxml/health_start.fxml +++ b/src/main/resources/fxml/health_start.fxml @@ -26,7 +26,7 @@ - + diff --git a/src/main/resources/fxml/main_window_title.fxml b/src/main/resources/fxml/main_window_title.fxml index 734107e4f..bd60aa25d 100644 --- a/src/main/resources/fxml/main_window_title.fxml +++ b/src/main/resources/fxml/main_window_title.fxml @@ -7,6 +7,8 @@ + + -