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:
Caleb James DeLisle 2018-01-11 17:09:06 +01:00
commit 69aee6c21b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/src/less2/include/ckeditor-fix.less
View File

@ -14,7 +14,6 @@
} }
.cke_toolbox_main { .cke_toolbox_main {
display: inline-block; display: inline-block;
margin-bottom: -3px;
} }
#cke_1_contents { #cke_1_contents {
flex: 1; flex: 1;

3
www/pad/app-pad.less
View File

@ -16,8 +16,9 @@
display: flex; display: flex;
} }
#cke_1_toolbox { #cke_1_toolbox {
display: inline-block; display: inline-flex;
width: 100%; width: 100%;
flex-flow: column;
background-color: @colortheme_pad-toolbar-bg; background-color: @colortheme_pad-toolbar-bg;
} }
#cke_1_toolbox .cke_toolbar { #cke_1_toolbox .cke_toolbar {