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
2017-08-16 12:40:34 +02:00
parent 6b174934c8 e7ef1e1c2b
commit 4c949a61e7
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/code/code.less
View File

@@ -30,6 +30,7 @@ body {
min-width: 20%; min-width: 20%;
max-width: 80%; max-width: 80%;
resize: horizontal; resize: horizontal;
font-size: initial;
} }
.CodeMirror.fullPage { .CodeMirror.fullPage {
//min-width: 100%; //min-width: 100%;

2
www/code/main.js
View File

@@ -410,6 +410,7 @@ define([
} }
}); });
/*
// add the splitter // add the splitter
if (!$iframe.has('.cp-splitter').length) { if (!$iframe.has('.cp-splitter').length) {
var $preview = $iframe.find('#previewContainer'); var $preview = $iframe.find('#previewContainer');
@@ -437,6 +438,7 @@ define([
}); });
}); });
} }
*/
Cryptpad.removeLoadingScreen(); Cryptpad.removeLoadingScreen();
setEditable(true); setEditable(true);

1
www/slide/slide.less
View File

@@ -36,6 +36,7 @@ h6 { font-size: 24px; }
body { body {
.CodeMirror { .CodeMirror {
height: 100%; height: 100%;
font-size: initial;
} }
.CodeMirror-focused .cm-matchhighlight { .CodeMirror-focused .cm-matchhighlight {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==); background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);