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

2019-11-06 16:26:40 +01:00
parent c12f747b3d d4e6bc780b
commit 567b5b8fbe
4 changed files with 18 additions and 6 deletions
--- a/customize.dist/src/less2/include/notifications.less
+++ b/customize.dist/src/less2/include/notifications.less
@@ -10,6 +10,9 @@
        max-width: 300px;
        display: flex;
        flex-flow: column;
+        & hr {
+            margin: 0px !important;
+        }
        .cp-notification {
            min-height: @notif-height;
            display: flex;
@@ -40,9 +43,6 @@
            }
        }
    }
-    hr {
-        margin: 0px !important;
-    }
    .cp-notifications-gotoapp {
        p {
            padding: 10px 0 !important;