Merge remote-tracking branch 'origin/staging' into staging

2019-12-17 16:41:10 +00:00
parent 43d30081e7 972f50052d
commit 147d6cf232
18 changed files with 565 additions and 168 deletions
--- a/customize.dist/src/less2/include/messenger.less
+++ b/customize.dist/src/less2/include/messenger.less
@@ -78,6 +78,9 @@
                .cp-app-contacts-name {
                    white-space: nowrap;
                }
+                .cp-app-contacts-icons {
+                    text-align: right;
+                }
            }
            &:hover {
                background-color: rgba(0,0,0,0.3);
@@ -89,6 +92,7 @@
        .cp-app-contacts-remove {
            cursor: pointer;
            width: 20px;
+            text-align: center;
            &:hover {
                color: darken(@color, 20%);
            }
@@ -121,6 +125,15 @@
                    }
                }
            }
+            .cp-app-contacts-muted-button {
+                margin: 10px;
+                border: 0;
+                display: none;
+                order: 3;
+                .fa-bell-slash {
+                    margin-right: 10px;
+                }
+            }
        }
    }