mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-01-27 09:24:45 +00:00
Code Issues Releases Wiki Activity

Revert #3607 and #3608

Browse Source 
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?
This commit is contained in:
Jermolene 2018-12-02 20:57:13 +00:00
parent e466f62e7e
commit 87b3e470c2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/modules/editor/engines/framed.js
View File

@ -40,6 +40,7 @@ function FramedEngine(options) {
// Style the iframe // Style the iframe
this.iframeNode.className = this.dummyTextArea.className; this.iframeNode.className = this.dummyTextArea.className;
this.iframeNode.style["border-radius"] = "2px"; this.iframeNode.style["border-radius"] = "2px";
this.iframeNode.style.border = "none";
this.iframeNode.style.padding = "0"; this.iframeNode.style.padding = "0";
this.iframeNode.style.resize = "none"; this.iframeNode.style.resize = "none";
this.iframeNode.style["background-color"] = this.widget.wiki.extractTiddlerDataItem(this.widget.wiki.getTiddlerText("$:/palette"),"background"); this.iframeNode.style["background-color"] = this.widget.wiki.extractTiddlerDataItem(this.widget.wiki.getTiddlerText("$:/palette"),"background");

7
themes/tiddlywiki/vanilla/base.tid
View File

@ -1274,19 +1274,14 @@ html body.tc-body.tc-single-tiddler-window {
.tc-tiddler-preview { .tc-tiddler-preview {
overflow: auto; overflow: auto;
margin-left: -0.3em;
margin-right: -0.3em;
padding-left: 0.3em;
padding-right: 0.3em;
} }
.tc-tiddler-preview-preview { .tc-tiddler-preview-preview {
float: right; float: right;
width: 49%; width: 49%;
border: 1px solid <<colour tiddler-editor-border>>; border: 1px solid <<colour tiddler-editor-border>>;
border-radius: 2px;
margin: 4px 0 3px 3px; margin: 4px 0 3px 3px;
padding: 3px 3px 3px 0.5em; padding: 3px 3px 3px 3px;
} }
<<if-editor-height-fixed then:""" <<if-editor-height-fixed then:"""