Merge branch 'staging' into communities-kanban

This commit is contained in:
yflory
2020-03-09 15:14:08 +01:00
43 changed files with 970 additions and 576 deletions

View File

@@ -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)")
]);
};

View File

@@ -434,7 +434,7 @@
width: 50px;
margin: 0;
min-width: 0;
font-size: 18px;
font-size: 18px !important;
}
}
}

View File

@@ -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;