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

2017-05-23 12:35:54 +02:00 · 2017-05-23 12:35:54 +02:00 · cf83cab596
parent 0a646a9534 6ddfe0e901
commit cf83cab596
2 changed files with 4 additions and 0 deletions
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@ -414,6 +414,8 @@
    margin-bottom: -1px;
    .cryptpad-dropdown-users {
        pre {
+            /* needed for ckeditor */
+            white-space: pre;
            margin: 5px 0px;
        }
    }
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@ -489,6 +489,8 @@
  margin-bottom: -1px;
 }
 .cryptpad-toolbar-leftside .cryptpad-dropdown-users pre {
+  /* needed for ckeditor */
+  white-space: pre;
  margin: 5px 0px;
 }
 .cryptpad-toolbar-leftside button {