Merge branch 'staging' into communities-kanban

2020-03-09 15:14:08 +01:00
parent b768ac5a4a d73b32a05e
commit b85d0fc9df
43 changed files with 970 additions and 576 deletions
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -434,7 +434,7 @@
                    width: 50px;
                    margin: 0;
                    min-width: 0;
-                    font-size: 18px;
+                    font-size: 18px !important;
                }
            }
        }
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -1159,6 +1159,11 @@
                        margin-left: 11px;
                    }
                }
+                &.fa-unlock-alt {
+                    .cp-toolbar-drawer-element {
+                        margin-left: 15px;
+                    }
+                }
                &.fa-question {
                    .cp-toolbar-drawer-element {
                        margin-left: 16px;