From 2a8abc2699030a4cf47743d7aae67c94d73a2904 Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 16 Aug 2017 12:15:08 +0200 Subject: [PATCH 1/2] comment out splitter code --- www/code/main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/code/main.js b/www/code/main.js index 7ac345fb6..a7e6f1447 100644 --- a/www/code/main.js +++ b/www/code/main.js @@ -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); From 7c49ca6e3f69ab4ccd4d261c061ffa731927e79d Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 16 Aug 2017 12:34:56 +0200 Subject: [PATCH 2/2] Fix initial text size in code --- www/code/code.less | 1 + www/slide/slide.less | 1 + 2 files changed, 2 insertions(+) diff --git a/www/code/code.less b/www/code/code.less index 7c39ead2b..36883f377 100644 --- a/www/code/code.less +++ b/www/code/code.less @@ -30,6 +30,7 @@ body { min-width: 20%; max-width: 80%; resize: horizontal; + font-size: initial; } .CodeMirror.fullPage { //min-width: 100%; diff --git a/www/slide/slide.less b/www/slide/slide.less index 9e020f98f..8358f849a 100644 --- a/www/slide/slide.less +++ b/www/slide/slide.less @@ -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==);