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

This commit is contained in:
Pierre Bondoerffer
2017-03-02 17:44:29 +01:00
49 changed files with 185 additions and 290 deletions

View File

@@ -372,8 +372,8 @@
float: left;
margin-bottom: -1px;
}
.cryptpad-toolbar-leftside .cryptpad-user-list {
float: right;
.cryptpad-toolbar-leftside .cryptpad-user-list pre {
white-space: pre;
}
.cryptpad-toolbar-leftside button {
margin: 2px 4px 2px 0px;