Merge branch 'staging' into team

2019-09-09 15:39:28 +02:00
parent 634d24b46c d993827c7e
commit dbe63f254a
7 changed files with 115 additions and 74 deletions
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -442,7 +442,7 @@
            margin-bottom: 15px;
        }
        .cp-share-grid {
-            max-height: 228px;
+            max-height: 225px;
            overflow-x: auto;
        }
        .cp-recent-only {
@@ -478,6 +478,7 @@
            margin-bottom: 6px;
            cursor: default;
            transition: order 0.5s, background-color 0.5s;
+            margin-top: 1px;
            .tools_unselectable();

            &.cp-selected {