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
@@ -107,7 +107,7 @@ define([
                    ])*/
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v3.12.0 (Megaloceros)")
+            h('div.cp-version-footer', "CryptPad v3.13.0 (NorthernWhiteRhino)")
        ]);
    };

@@ -434,7 +434,7 @@
                    width: 50px;
                    margin: 0;
                    min-width: 0;
-                    font-size: 18px;
+                    font-size: 18px !important;
                }
            }
        }
@@ -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;