From d29df793a4aef2a6d36a7b2dddd17f96ab4a8dec Mon Sep 17 00:00:00 2001 From: Mateusz Wilczek <36714554+mateuszwilczek@users.noreply.github.com> Date: Sat, 24 Feb 2024 10:26:41 +0100 Subject: [PATCH] Docs: Improve `.from-version` macro (#7874) * Docs: Improve `.from-version` macro * Restore icons in version badges --- .../tw5.com/tiddlers/system/doc-styles.tid | 29 +++++++++++-------- .../tiddlers/system/version-macros.tid | 13 +++++++-- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/editions/tw5.com/tiddlers/system/doc-styles.tid b/editions/tw5.com/tiddlers/system/doc-styles.tid index 9ae22868f..0e7bb977c 100644 --- a/editions/tw5.com/tiddlers/system/doc-styles.tid +++ b/editions/tw5.com/tiddlers/system/doc-styles.tid @@ -1,5 +1,5 @@ created: 20150117152612000 -modified: 20230325101137075 +modified: 20240223123123497 tags: $:/tags/Stylesheet title: $:/editions/tw5.com/doc-styles type: text/vnd.tiddlywiki @@ -181,18 +181,23 @@ tr.doc-table-subheading { fill: <>; } -a.doc-from-version.tc-tiddlylink { - display: inline-block; - border-radius: 1em; - background: <>; - color: <>; - fill: <>; - padding: 0 0.4em; - font-size: 0.7em; - text-transform: uppercase; +a.doc-from-version { + background-color: <>; + color: <$wikify name="background" text="<>" mode="inline"><$transclude $variable="contrastcolour" target=<> colourA="#000000" colourB="#ffffff" />; + padding: 3px; + border-radius: 4px; font-weight: bold; - line-height: 1.5; - vertical-align: text-bottom; + font-size: 0.75em; +} + +a.doc-from-version.doc-from-version-new { + background-color: <>; + color: <>; +} + +a.doc-from-version svg { + fill: currentColor; + vertical-align: sub; } a.doc-deprecated-version.tc-tiddlylink { diff --git a/editions/tw5.com/tiddlers/system/version-macros.tid b/editions/tw5.com/tiddlers/system/version-macros.tid index 0fb7dcf12..9fd66f24f 100644 --- a/editions/tw5.com/tiddlers/system/version-macros.tid +++ b/editions/tw5.com/tiddlers/system/version-macros.tid @@ -1,12 +1,19 @@ code-body: yes created: 20161008085627406 -modified: 20221007122259593 +modified: 20231206135257498 tags: $:/tags/Macro title: $:/editions/tw5.com/version-macros type: text/vnd.tiddlywiki -\define .from-version(version) -<$link to={{{ [<__version__>addprefix[Release ]] }}} class="doc-from-version">{{$:/core/images/warning}} New in: <$text text=<<__version__>>/> +\procedure .from-version-reference() 5.3.0 + +\procedure .from-version-template(class, text) +<$link to={{{ [addprefix[Release ]] }}} class=<> >@@.tc-tiny-gap-right {{$:/core/images/info-button}}@@<><> +\end + +\procedure .from-version(version) +<$list filter="[compare:version:gteq<.from-version-reference>]"><<.from-version-template "doc-from-version doc-from-version-new" "New in v">> +<$list filter="[compare:version:lt<.from-version-reference>]"><<.from-version-template "doc-from-version" "Introduced in v">> \end \define .deprecated-since(version, superseded:"TODO-Link")