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

pull/1/head
Caleb James DeLisle 7 years ago
commit 69aee6c21b

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

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

Loading…
Cancel
Save