Merge branch 'file_transfers'

Conflicts: src/mainscreen.py
2016-03-22 20:32:29 +03:00 · 2016-03-22 20:32:29 +03:00 · 4c1a02c9a3
commit 4c1a02c9a3
parent cd93d84dfd 6ffa15b4d7
15 changed files with 520 additions and 43 deletions
--- a/src/styles/style.qss
+++ b/src/styles/style.qss
@ -1239,4 +1239,9 @@ MessageItem::focus
 MessageEdit:hover
 {
    border: none;
+}
+
+QListWidget QPushButton 
+{
+    background-color: transparent;
 }