Merge branch 'notifications' of github.com:xwiki-labs/cryptpad into notifications

6 years ago · 3ccc8f63e4
parent b92075b78b b2d2fa4e46
commit 3ccc8f63e4
2 changed files with 4 additions and 1 deletions
--- a/customize.dist/src/less2/include/notifications.less
+++ b/customize.dist/src/less2/include/notifications.less
@ -39,8 +39,10 @@
            }
        }
    }
    hr {
        margin: 0px !important;
    }
    .cp-notifications-gotoapp {
        background-color: #ccc;
        p {
            padding: 10px 0 !important;
            text-align: center !important;
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@ -959,6 +959,7 @@ MessengerUI, Messages) {
        ]);
        var pads_options = [div];
        if (Common.isLoggedIn()) {
            pads_options.unshift(h("hr"));
            pads_options.unshift(openNotifsApp);
        }
        var dropdownConfig = {