Merge branch 'tiddlywiki-com'

TiddlyWiki · Oct 21, 2024 · b9218a8 · b9218a8
2 parents a0caa0f + 6d11f4b
commit b9218a8
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 12 deletions.
diff --git a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid
@@ -1,5 +1,5 @@
 created: 20140908114400000
-modified: 20230803053808167
+modified: 20241016125145988
 tags: About
 title: History of TiddlyWiki
 type: text/vnd.tiddlywiki

diff --git a/editions/tw5.com/tiddlers/commands/Commands.tid b/editions/tw5.com/tiddlers/commands/Commands.tid
@@ -1,9 +1,15 @@
 created: 20150117174359000
-modified: 20180626122309578
+modified: 20241018094151786
 tags: Concepts Reference
 title: Commands
 type: text/vnd.tiddlywiki
 
 A <<.def command>> is one of the following words, written with a `--` prefix and used as a command-line option under Node.js, indicating which action is desired. See [[Using TiddlyWiki on Node.js]] for details of how to use them.
 
-<<list-links "[tag[Commands]]">>
+''Commands''
+
+<<list-links "[tag[Commands]] -[tag[$:/deprecated]]" class:"multi-columns">>
+
+''Deprecated Commands''
+
+<<list-links "[tag[Commands]] :and[tag[$:/deprecated]]" class:"multi-columns">>
diff --git a/editions/tw5.com/tiddlers/commands/ServerCommand.tid b/editions/tw5.com/tiddlers/commands/ServerCommand.tid
@@ -1,10 +1,12 @@
 caption: server
 created: 20131219163923630
 modified: 20180626150505679
-tags: Commands
+tags: Commands $:/deprecated
 title: ServerCommand
 type: text/vnd.tiddlywiki
 
+<<.deprecated-since "5.1.18" "ListenCommand">>.
+
 ''Note that the `--server` command is now deprecated in favour of the new ListenCommand''.
 
 See WebServer for details of TiddlyWiki's web server functionality.

diff --git a/editions/tw5.com/tiddlers/community/resources/Grok TiddlyWiki by Soren Bjornstad.tid b/editions/tw5.com/tiddlers/community/resources/Grok TiddlyWiki by Soren Bjornstad.tid
@@ -1,15 +1,15 @@
 created: 20210519110226889
-modified: 20210519110226889
+modified: 20241021161007731
 tags: [[Other Resources]]
 title: "Grok TiddlyWiki" by Soren Bjornstad
 type: text/vnd.tiddlywiki
 url: https://groktiddlywiki.com/read/
 
-This new textbook from Soren Bjornstad is highly recommended for learning ~TiddlyWiki. The presentation and design are also a first class example of using ~TiddlyWiki.
+Grok ~TiddlyWiki by Soren Bjornstad is an interactive learning environment for TiddlyWiki. It bundles three complementary modes of learning into one TiddlyWiki:
 
-From the site:
-
-> Grok ~TiddlyWiki is a textbook that helps you build a deep, lasting understanding of and proficiency with ~TiddlyWiki through a combination of detailed explanations, practical exercises, and spaced-repetition reviews of prompts called takeaways.
+* It ''explains concepts'' using English text and code examples
+* It ''assigns exercises'' that help you apply and practice what you've learned
+* It ''presents takeaways'', questions about key terms, concepts, or skills, for review as you continue through the book, to help you retain what you've learned over a longer period of time
 
 {{!!url}}
 

diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid
@@ -2,7 +2,8 @@ title: HelloThumbnail - Grok TiddlyWiki
 tags: HelloThumbnail
 color: #D5B7EA
 image: Grok TiddlyWiki Banner
-caption: Grok ~TiddlyWiki
+caption: Grok ~TiddlyWiki 2.0
 link: "Grok TiddlyWiki" by Soren Bjornstad
+ribbon-text: NEW 2.0
 
-Everything you need to know to get the best out of ~TiddlyWiki
+A comprehensive interactive guide to ~TiddlyWiki, from the very basics to the advanced concepts, featuring exercises and takeaways to aid learning
diff --git a/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png b/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png
diff --git a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
@@ -117,12 +117,19 @@ type: text/vnd.tiddlywiki
  -webkit-column-gap: 1em;
 }
 
-@media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
+/* Switch to 2 columns for 780x1280 displays which is 780p */
+@media (max-width: 1279px) {
  .multi-columns {
  column-count: 2;
  }
 }
 
+@media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
+ .multi-columns {
+ column-count: 1;
+ }
+}
+
 .tc-saving-sidebar-category { margin-bottom:10px; }
 .tc-saving-sidebar-category-title { margin-bottom:5px; font-weight:bold; }
 .tc-saving-sidebar-category-item { margin-left:10px; white-space:nowrap; }
diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md
@@ -593,3 +593,5 @@ Val Packett, @valpackett, 2024/07/26
 @IchijikuIchigo, 2024/09/29
 
 JC John Sese Cuneta, @techmagus, 2024/10/07
+
+@zorrox1024, 2024/10/20