Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
4c949a61e7
|
@ -30,6 +30,7 @@ body {
|
|||
min-width: 20%;
|
||||
max-width: 80%;
|
||||
resize: horizontal;
|
||||
font-size: initial;
|
||||
}
|
||||
.CodeMirror.fullPage {
|
||||
//min-width: 100%;
|
||||
|
|
|
@ -410,6 +410,7 @@ define([
|
|||
}
|
||||
});
|
||||
|
||||
/*
|
||||
// add the splitter
|
||||
if (!$iframe.has('.cp-splitter').length) {
|
||||
var $preview = $iframe.find('#previewContainer');
|
||||
|
@ -437,6 +438,7 @@ define([
|
|||
});
|
||||
});
|
||||
}
|
||||
*/
|
||||
|
||||
Cryptpad.removeLoadingScreen();
|
||||
setEditable(true);
|
||||
|
|
|
@ -36,6 +36,7 @@ h6 { font-size: 24px; }
|
|||
body {
|
||||
.CodeMirror {
|
||||
height: 100%;
|
||||
font-size: initial;
|
||||
}
|
||||
.CodeMirror-focused .cm-matchhighlight {
|
||||
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
|
||||
|
|
Loading…
Reference in New Issue