From bf499da97d298003c787df5d168258c8912fa43e Mon Sep 17 00:00:00 2001 From: DieGurke <55625494+DieGurke@users.noreply.github.com> Date: Thu, 16 Jul 2020 18:17:52 +0200 Subject: [PATCH] Adjusted message Enter bar (field and buttons) and changed color --- client/src/main/resources/css/base.css | 22 ++++++++++++++++ client/src/main/resources/css/dark.css | 5 ++-- client/src/main/resources/fxml/ChatScene.fxml | 25 ++++++++++++------- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/client/src/main/resources/css/base.css b/client/src/main/resources/css/base.css index 013ef59..5c1027d 100644 --- a/client/src/main/resources/css/base.css +++ b/client/src/main/resources/css/base.css @@ -8,6 +8,28 @@ -fx-background-color: transparent; } +#messageEnterContainer { + -fx-background-radius: 5em; +} + +#bottomButton { + -fx-background-radius: 5em; +} + +.text-area { + -fx-background-color: transparent; +} + +.text-area .scroll-pane { + -fx-background-color: transparent; +} +.text-area .scroll-pane .viewport{ + -fx-background-color: transparent; +} +.text-area .scroll-pane .content{ + -fx-background-color: transparent; +} + .menu-item { -fx-background-radius: 15.0px; } diff --git a/client/src/main/resources/css/dark.css b/client/src/main/resources/css/dark.css index d97369e..52c8663 100644 --- a/client/src/main/resources/css/dark.css +++ b/client/src/main/resources/css/dark.css @@ -18,8 +18,8 @@ -fx-background-color: lightgray; } -.list-view, .list-cell, .text-area .content, .text-field, .password-field, .tooltip, .pane, .pane .content, .vbox, .titled-pane > .title, .titled-pane > *.content, .context-menu, .menu-item { - -fx-background-color: dimgray; +.list-view, .list-cell, #messageEnterContainer, .text-field, .password-field, .tooltip, .pane, .pane .content, .vbox, .titled-pane > .title, .titled-pane > *.content, .context-menu, .menu-item { + -fx-background-color: #262626; } .list-cell:selected, .list-cell:selected > *, .menu-item:hover { @@ -45,3 +45,4 @@ #loginBackground { -fx-background-color: rgb(25, 25, 25); } + diff --git a/client/src/main/resources/fxml/ChatScene.fxml b/client/src/main/resources/fxml/ChatScene.fxml index 86e2518..2422464 100644 --- a/client/src/main/resources/fxml/ChatScene.fxml +++ b/client/src/main/resources/fxml/ChatScene.fxml @@ -69,14 +69,21 @@ - + - - - -