web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
ansuz 2017-05-23 12:35:54 +02:00
commit cf83cab596
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/src/less/toolbar.less
View File

@ -414,6 +414,8 @@
margin-bottom: -1px; margin-bottom: -1px;
.cryptpad-dropdown-users { .cryptpad-dropdown-users {
pre { pre {
/* needed for ckeditor */
white-space: pre;
margin: 5px 0px; margin: 5px 0px;
} }
} }

2
customize.dist/toolbar.css
View File

@ -489,6 +489,8 @@
margin-bottom: -1px; margin-bottom: -1px;
} }
.cryptpad-toolbar-leftside .cryptpad-dropdown-users pre { .cryptpad-toolbar-leftside .cryptpad-dropdown-users pre {
/* needed for ckeditor */
white-space: pre;
margin: 5px 0px; margin: 5px 0px;
} }
.cryptpad-toolbar-leftside button { .cryptpad-toolbar-leftside button {