zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Merge branch 'develop' into f/chatscene-commands

Browse Source
This commit is contained in:
Leon Hofmeister
2020-09-30 22:34:13 +02:00
parent 7468947728 85d0aa37d2
commit fa1ad52f4c
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/envoy/client/ui/listcell/MessageListCell.java
View File

@@ -32,6 +32,6 @@ public final class MessageListCell extends AbstractListCell<Message, MessageCont
private void adjustPadding(int listWidth, boolean ownMessage) { private void adjustPadding(int listWidth, boolean ownMessage) {
int padding = 10 + Math.max((listWidth - 1000) / 2, 0); int padding = 10 + Math.max((listWidth - 1000) / 2, 0);
setPadding(ownMessage ? new Insets(0, padding, 6, 0) : new Insets(0, 0, 6, padding)); setPadding(ownMessage ? new Insets(3, padding, 3, 0) : new Insets(3, 0, 3, padding));
} }
} }

6
client/src/main/resources/css/base.css
View File

@@ -4,8 +4,10 @@
.context-menu, .context-menu > * { .context-menu, .context-menu > * {
-fx-background-radius: 15.0px; -fx-background-radius: 15.0px;
/*TODO: solution below does not work */ }
-fx-background-color: transparent;
.list-cell:selected, .menu-item:hover {
-fx-background-color: #454c4f;
} }
#text-enter-container, #contact-search-enter-container { #text-enter-container, #contact-search-enter-container {

4
client/src/main/resources/css/dark.css
View File

@@ -22,10 +22,6 @@
-fx-background-color: #222222; -fx-background-color: #222222;
} }
.list-cell:selected, .list-cell:selected > *, .menu-item:hover {
-fx-background-color: #690099;
}
.received-message { .received-message {
-fx-background-color: gray; -fx-background-color: gray;
} }

4
client/src/main/resources/css/light.css
View File

@@ -18,10 +18,6 @@
-fx-background-color: #E3E3E3; -fx-background-color: #E3E3E3;
} }
.list-cell:selected, .list-cell:selected > *, .menu-item:hover {
-fx-background-color: #805959;
}
.received-message { .received-message {
-fx-background-color: lightgray; -fx-background-color: lightgray;
} }