From b1c295230de1b14bcf7639ef184f3b9e1c068e22 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Mon, 10 Apr 2023 21:03:26 +0100 Subject: [PATCH 1/3] Fix clean.sh It was missing the output of the `zh-Hans` edition previously --- bin/clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/clean.sh b/bin/clean.sh index 522479edb..5a56e1971 100755 --- a/bin/clean.sh +++ b/bin/clean.sh @@ -2,4 +2,4 @@ # Remove any output files -find . -regex "^./editions/[a-z0-9\.-]*/output/.*" -delete +find . -regex "^./editions/.*/output/.*" -delete From d3ef198842d6e68183cf86ca63b5401fa6261660 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Wed, 12 Apr 2023 11:18:17 +0100 Subject: [PATCH 2/3] Remove the 14px adjustment to textarea autoheight (#7400) --- core/modules/editor/engines/framed.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js index b4f700f2b..948890645 100644 --- a/core/modules/editor/engines/framed.js +++ b/core/modules/editor/engines/framed.js @@ -162,13 +162,13 @@ FramedEngine.prototype.fixHeight = function() { if(this.widget.editAutoHeight) { if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) { var newHeight = $tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight); - this.iframeNode.style.height = (newHeight + 14) + "px"; // +14 for the border on the textarea + this.iframeNode.style.height = newHeight + "px"; } } else { var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10); fixedHeight = Math.max(fixedHeight,20); this.domNode.style.height = fixedHeight + "px"; - this.iframeNode.style.height = (fixedHeight + 14) + "px"; + this.iframeNode.style.height = fixedHeight + "px"; } } }; From be67b0714c8f1a83e76728fcc7c980ee5918ca63 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Wed, 12 Apr 2023 14:25:56 +0100 Subject: [PATCH 3/3] Add a community link to Open Collective --- editions/tw5.com/tiddlers/hellothere/HelloThere.tid | 3 +++ editions/tw5.com/tiddlers/images/Open Collective Logo.tid | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 editions/tw5.com/tiddlers/images/Open Collective Logo.tid diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid index 8a2b3665e..d58179819 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid @@ -51,6 +51,9 @@ TiddlyWiki lets you choose where to keep your data, guaranteeing that in the dec {{Reddit Logo}} Reddit + +{{Open Collective Logo}} Open Collective + !! ''Testimonials & Reviews'' diff --git a/editions/tw5.com/tiddlers/images/Open Collective Logo.tid b/editions/tw5.com/tiddlers/images/Open Collective Logo.tid new file mode 100644 index 000000000..25e91161a --- /dev/null +++ b/editions/tw5.com/tiddlers/images/Open Collective Logo.tid @@ -0,0 +1,4 @@ +title: Open Collective Logo +tags: picture + + \ No newline at end of file