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

7 years ago · 69aee6c21b
parent 378322a521 02d1f10231
commit 69aee6c21b
2 changed files with 2 additions and 2 deletions
--- a/customize.dist/src/less2/include/ckeditor-fix.less
+++ b/customize.dist/src/less2/include/ckeditor-fix.less
@ -14,7 +14,6 @@
    }
    .cke_toolbox_main {
        display: inline-block;
-        margin-bottom: -3px;
    }
    #cke_1_contents {
        flex: 1;
--- a/www/pad/app-pad.less
+++ b/www/pad/app-pad.less
@ -16,8 +16,9 @@
        display: flex;
    }
    #cke_1_toolbox {
-        display: inline-block;
+        display: inline-flex;
        width: 100%;
+        flex-flow: column;
        background-color: @colortheme_pad-toolbar-bg;
    }
    #cke_1_toolbox .cke_toolbar {