From f581b833592bfbfcd77d28f1360efa5a8d1cc5f9 Mon Sep 17 00:00:00 2001 From: DieGurke Date: Wed, 26 Aug 2020 18:31:23 +0200 Subject: [PATCH] Added semi-proper light theme and fixed some coloring bugs. --- client/src/main/resources/css/light.css | 87 ++++++++++++++++-- .../main/resources/fxml/SettingsScene.fxml | 17 +--- .../main/resources/icons/light/forward.png | Bin 26014 -> 26397 bytes .../main/resources/icons/light/group_icon.png | Bin 52894 -> 48859 bytes .../main/resources/icons/light/user_icon.png | Bin 39949 -> 33797 bytes 5 files changed, 82 insertions(+), 22 deletions(-) diff --git a/client/src/main/resources/css/light.css b/client/src/main/resources/css/light.css index 8486dcb..1648fe8 100644 --- a/client/src/main/resources/css/light.css +++ b/client/src/main/resources/css/light.css @@ -1,20 +1,89 @@ -.button{ - -fx-background-color: orangered; -} - -.list-cell:selected, .list-cell:selected > * { - -fx-background-color: orangered; +* { -fx-text-fill: black; } -.received-message, .menu-item { +.root { + -fx-background-color: #E6E6E6; +} + +.button { + -fx-background-color: #B37D7D; +} + +.button:pressed { + -fx-background-color: #808080; +} + +.button:disabled { + -fx-background-color: lightgray; +} + +#message-list, .text-field, .password-field, .tooltip, .pane, .pane .content, .vbox, .titled-pane > .title, .titled-pane > *.content, .context-menu, .menu-item { + -fx-background-color: #E3E3E3; +} + +.list-cell:selected, .list-cell:selected > *, .menu-item:hover { + -fx-background-color: #805959; +} + +.received-message { -fx-background-color: lightgray; } .own-message { - -fx-background-color: lightgreen; + -fx-background-color: #8fa88f; } -#loginInputField { +.alert.information.dialog-pane, .alert.warning.dialog-pane, .alert.error.dialog-pane { + -fx-background-color: black; +} + +#login-input-field { -fx-border-color: black; } + +#login-background { + -fx-background-color: white; +} + +#chat-list, #top-bar, #search-panel, #note-background { + -fx-background-color: white; +} + +#text-enter-container { + -fx-background-color: #F2F2F2; +} + +#contact-search-enter-container { + -fx-background-color: #CCCCCC; +} + +#underline { + -fx-border: solid; + -fx-border-width: 0.0 0.0 1.0 0.0; + -fx-border-color: #CCCCCC; +} + +.group-member-names { + -fx-text-fill: #805959; + -fx-font-weight: bold; +} + +.scroll-bar:vertical, .scroll-bar:vertical .track, .scroll-bar:vertical .increment-button , .scroll-bar:vertical .decrement-button { + -fx-background-color: transparent; +} + +.scroll-bar:vertical .increment-arrow, .scroll-bar:vertical .decrement-arrow { + -fx-background-color: transparent; +} + +.scroll-bar:vertical .thumb { + -fx-background-color: #707070; + -fx-background-insets : 4.0, 0.0, 0.0; + -fx-background-radius : 2.0em; +} + +#proceed-button { + -fx-text-fill: white; + -fx-background-color: transparent; +} diff --git a/client/src/main/resources/fxml/SettingsScene.fxml b/client/src/main/resources/fxml/SettingsScene.fxml index fdf4a8f..50a90ab 100644 --- a/client/src/main/resources/fxml/SettingsScene.fxml +++ b/client/src/main/resources/fxml/SettingsScene.fxml @@ -7,18 +7,11 @@ - + - + @@ -29,8 +22,7 @@ - + @@ -40,8 +32,7 @@ -