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

2017-03-02 17:44:29 +01:00
parent e39fe1c0b7 52793385ea
commit 800db07077
49 changed files with 185 additions and 290 deletions
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -861,8 +861,6 @@ form.realtime, div.realtime {
            max-width: 90%;
            max-height: 90%;
            margin: auto;
-
-            border: 5px solid red;
        }
    }
 }
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -309,7 +309,10 @@
    float: left;
    margin-bottom: -1px;
    .cryptpad-user-list {
-        float: right;
+        //float: right;
+        pre {
+            white-space: pre;
+        }
    }
    button {
        margin: 2px 4px 2px 0px;