blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 {
display: inline-block;
margin-bottom: -3px;
}
#cke_1_contents {
flex: 1;

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

@ -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 {