From 87b3e470c2618801c9371eeb3cad6bcb12874d82 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sun, 2 Dec 2018 20:57:13 +0000 Subject: [PATCH] Revert #3607 and #3608 Hi @BurningTreeC apologies I merged these without properly looking at them, but I think we should move them to 5.1.19 because: * On Chrome, the new version hides the resize handle on textarea, which can be quite useful * It's visually quite different, and I think might benefit from more discussion * It's inconsistent with the CodeMirror editor Would you mind perhaps starting another PR for edit template enhancements? --- core/modules/editor/engines/framed.js | 1 + themes/tiddlywiki/vanilla/base.tid | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js index 347de034d..e5aaa4a1e 100644 --- a/core/modules/editor/engines/framed.js +++ b/core/modules/editor/engines/framed.js @@ -40,6 +40,7 @@ function FramedEngine(options) { // Style the iframe this.iframeNode.className = this.dummyTextArea.className; this.iframeNode.style["border-radius"] = "2px"; + this.iframeNode.style.border = "none"; this.iframeNode.style.padding = "0"; this.iframeNode.style.resize = "none"; this.iframeNode.style["background-color"] = this.widget.wiki.extractTiddlerDataItem(this.widget.wiki.getTiddlerText("$:/palette"),"background"); diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index c71db56b3..50c0214c9 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1274,19 +1274,14 @@ html body.tc-body.tc-single-tiddler-window { .tc-tiddler-preview { overflow: auto; - margin-left: -0.3em; - margin-right: -0.3em; - padding-left: 0.3em; - padding-right: 0.3em; } .tc-tiddler-preview-preview { float: right; width: 49%; border: 1px solid <>; - border-radius: 2px; margin: 4px 0 3px 3px; - padding: 3px 3px 3px 0.5em; + padding: 3px 3px 3px 3px; } <