From 24435a46be17a166dbf043a9bedf20fa6f999be0 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Wed, 18 Mar 2015 11:46:28 +0000 Subject: [PATCH] Lots of improvements to the plugin library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Moved “add new plugin” into a modal wizard * Adopt big friendly buttons * Add plugin icons and readmes to “add new plugin” modal * Use tabs for splitting plugins/themes/languages * Consistent styling between the “add new plugin” modal and the “installed plugins” control panel tab * Behind the scenes, moved from addressing the library as `recipes/defaults/tiddlers/` to `recipes/library/tiddlers` --- core/language/en-GB/ControlPanel.multids | 16 +-- core/modules/commands/savelibrarytiddlers.js | 34 ++++- core/modules/startup/browser-messaging.js | 4 +- core/ui/ControlPanel/AddPlugins.tid | 88 ------------- core/ui/ControlPanel/InstalledPlugins.tid | 101 --------------- core/ui/ControlPanel/Modals/AddPlugins.tid | 116 ++++++++++++++++++ core/ui/ControlPanel/Plugins.tid | 7 -- .../ui/ControlPanel/Plugins/Add/Languages.tid | 4 + core/ui/ControlPanel/Plugins/Add/Plugins.tid | 4 + core/ui/ControlPanel/Plugins/Add/Themes.tid | 4 + .../Plugins/Installed/Languages.tid | 4 + .../Plugins/Installed/Plugins.tid | 4 + .../ControlPanel/Plugins/Installed/Themes.tid | 4 + editions/pluginlibrary/tiddlywiki.info | 4 +- .../tiddlywiki/pluginlibrary/libraryserver.js | 10 +- themes/tiddlywiki/snowwhite/base.tid | 2 +- themes/tiddlywiki/vanilla/base.tid | 43 ++++++- 17 files changed, 227 insertions(+), 222 deletions(-) delete mode 100644 core/ui/ControlPanel/AddPlugins.tid delete mode 100644 core/ui/ControlPanel/InstalledPlugins.tid create mode 100644 core/ui/ControlPanel/Modals/AddPlugins.tid delete mode 100644 core/ui/ControlPanel/Plugins.tid create mode 100644 core/ui/ControlPanel/Plugins/Add/Languages.tid create mode 100644 core/ui/ControlPanel/Plugins/Add/Plugins.tid create mode 100644 core/ui/ControlPanel/Plugins/Add/Themes.tid create mode 100644 core/ui/ControlPanel/Plugins/Installed/Languages.tid create mode 100644 core/ui/ControlPanel/Plugins/Installed/Plugins.tid create mode 100644 core/ui/ControlPanel/Plugins/Installed/Themes.tid diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index e8bea8c7b..f9ea31ff8 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -38,8 +38,8 @@ Palette/Editor/Reset/Caption: reset Palette/HideEditor/Caption: hide editor Palette/Prompt: Current palette: Palette/ShowEditor/Caption: show editor -Plugins/Add/Hint: Install new plugins -Plugins/Add/Caption: Add +Plugins/Add/Hint: Install plugins from the official library +Plugins/Add/Caption: Get more plugins Plugins/Caption: Plugins Plugins/Disable/Caption: disable Plugins/Disable/Hint: Disable this plugin when reloading page @@ -47,11 +47,13 @@ Plugins/Disabled/Status: (disabled) Plugins/Empty/Hint: None Plugins/Enable/Caption: enable Plugins/Enable/Hint: Enable this plugin when reloading page -Plugins/Installed/Hint: Currently installed plugins -Plugins/Installed/Caption: Installed -Plugins/Language/Prompt: Languages -Plugins/Plugin/Prompt: Plugins -Plugins/Theme/Prompt: Themes +Plugins/Installed/Hint: Currently installed plugins: +Plugins/Languages/Caption: Languages +Plugins/Languages/Hint: Language pack plugins +Plugins/Plugins/Caption: Plugins +Plugins/Plugins/Hint: Plugins +Plugins/Themes/Caption: Themes +Plugins/Themes/Hint: Theme plugins Saving/Caption: Saving Saving/Heading: Saving Saving/TiddlySpot/Advanced/Heading: Advanced Settings diff --git a/core/modules/commands/savelibrarytiddlers.js b/core/modules/commands/savelibrarytiddlers.js index 925be358a..d0c6d44fe 100644 --- a/core/modules/commands/savelibrarytiddlers.js +++ b/core/modules/commands/savelibrarytiddlers.js @@ -39,20 +39,44 @@ Command.prototype.execute = function() { fs = require("fs"), path = require("path"), containerTitle = this.params[0], - basepath = this.params[1], - skinnyListTitle = this.params[2]; + filter = this.params[1], + basepath = this.params[2], + skinnyListTitle = this.params[3]; // Get the container tiddler as data var containerData = self.commander.wiki.getTiddlerData(containerTitle,undefined); if(!containerData) { return "'" + containerTitle + "' is not a tiddler bundle"; } - // Save each JSON file and collect the skinny data - var skinnyList = []; + // Filter the list of plugins + var pluginList = []; $tw.utils.each(containerData.tiddlers,function(tiddler,title) { + pluginList.push(title); + }); + var filteredPluginList; + if(filter) { + filteredPluginList = self.commander.wiki.filterTiddlers(filter,null,self.commander.wiki.makeTiddlerIterator(pluginList)); + } else { + filteredPluginList = pluginList; + } + // Iterate through the plugins + var skinnyList = []; + $tw.utils.each(filteredPluginList,function(title) { + var tiddler = containerData.tiddlers[title]; + // Save each JSON file and collect the skinny data var pathname = path.resolve(self.commander.outputPath,basepath + encodeURIComponent(title) + ".json"); $tw.utils.createFileDirectories(pathname); fs.writeFileSync(pathname,JSON.stringify(tiddler,null,$tw.config.preferences.jsonSpaces),"utf8"); - skinnyList.push($tw.utils.extend({},tiddler,{text: undefined})); + // Collect the skinny list data + var pluginTiddlers = JSON.parse(tiddler.text), + readmeContent = (pluginTiddlers.tiddlers[title + "/readme"] || {}).text, + iconTiddler = pluginTiddlers.tiddlers[title + "/icon"] || {}, + iconType = iconTiddler.type, + iconText = iconTiddler.text, + iconContent; + if(iconType && iconText) { + iconContent = $tw.utils.makeDataUri(iconText,iconType); + } + skinnyList.push($tw.utils.extend({},tiddler,{text: undefined, readme: readmeContent, icon: iconContent})); }); // Save the catalogue tiddler if(skinnyListTitle) { diff --git a/core/modules/startup/browser-messaging.js b/core/modules/startup/browser-messaging.js index 0b8fb9eb7..481449c74 100644 --- a/core/modules/startup/browser-messaging.js +++ b/core/modules/startup/browser-messaging.js @@ -82,7 +82,7 @@ exports.startup = function() { } else { iframeInfo.domNode.contentWindow.postMessage({ verb: "GET", - url: "recipes/default/tiddlers.json", + url: "recipes/library/tiddlers.json", cookies: { type: "save-info", infoTitlePrefix: paramObject.infoTitlePrefix || "$:/temp/RemoteAssetInfo/", @@ -104,7 +104,7 @@ exports.startup = function() { } else { iframeInfo.domNode.contentWindow.postMessage({ verb: "GET", - url: "recipes/default/tiddlers/" + encodeURIComponent(title) + ".json", + url: "recipes/library/tiddlers/" + encodeURIComponent(title) + ".json", cookies: { type: "save-tiddler", url: url diff --git a/core/ui/ControlPanel/AddPlugins.tid b/core/ui/ControlPanel/AddPlugins.tid deleted file mode 100644 index 85a85e92f..000000000 --- a/core/ui/ControlPanel/AddPlugins.tid +++ /dev/null @@ -1,88 +0,0 @@ -title: $:/core/ui/ControlPanel/Plugins/Add -tags: $:/tags/ControlPanel/Plugins -caption: {{$:/language/ControlPanel/Plugins/Add/Caption}} - -\define lingo-base() $:/language/ControlPanel/Plugins/ - -\define install-plugin-button() -<$button> -<$action-sendmessage $message="tm-load-plugin-from-library" url={{!!url}} title={{$(assetInfo)$!!original-title}}/> -<$list filter="[get[original-title]get[version]]" variable="installedVersion" emptyMessage="""install"""> -reinstall - - -\end - -\define display-plugin-info() - - -<> -
- - -''<$view tiddler=<> field="description"/>'' -
-<$view tiddler=<> field="original-title"/> - - -<$view tiddler=<> field="version"/> -<$list filter="[get[original-title]get[version]]" variable="installedVersion"> -
- -Installed: -
-<$text text=<>/> - - - - -\end - -\define load-plugin-library-button() -<$button> -<$action-sendmessage $message="tm-load-plugin-library" url={{!!url}} infoTitlePrefix="$:/temp/RemoteAssetInfo/"/> -open plugin library - -\end - -\define display-server-connection() -<$list filter="[all[tiddlers+shadows]tag[$:/tags/ServerConnection]suffix{!!url}]" variable="connectionTiddler" emptyMessage=<>> - -Search: <$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input" focus="true"/> -<$select tiddler="$:/temp/RemoteAssetCategory/$(currentTiddler)$" default="plugin"> - - - - - -<$set name="pluginType" filter="[[$:/temp/RemoteAssetCategory/$(currentTiddler)$]is[tiddler]]" value={{$:/temp/RemoteAssetCategory/$(currentTiddler)$}} emptyValue="plugin"> - - -<$list filter="[all[tiddlers+shadows]tag[$:/tags/RemoteAssetInfo]server-url{!!url}original-plugin-typesearch{$:/temp/RemoteAssetSearch/$(currentTiddler)$}sort[description]]" variable="assetInfo"> -<> - - -
- - -\end - -\define plugin-library-listing() -<$list filter="[all[tiddlers+shadows]tag[$:/tags/PluginLibrary]]"> -
- -!! <$link><$transclude field="caption"><$view field="title"/> - -//<$view field="url"/>// - -<$transclude/> - -<> -
- -\end - -
-<> -
- diff --git a/core/ui/ControlPanel/InstalledPlugins.tid b/core/ui/ControlPanel/InstalledPlugins.tid deleted file mode 100644 index 288e839c3..000000000 --- a/core/ui/ControlPanel/InstalledPlugins.tid +++ /dev/null @@ -1,101 +0,0 @@ -title: $:/core/ui/ControlPanel/Plugins/Installed -tags: $:/tags/ControlPanel/Plugins -caption: {{$:/language/ControlPanel/Plugins/Installed/Caption}} - -\define lingo-base() $:/language/ControlPanel/Plugins/ -\define popup-state-macro() -$(qualified-state)$-$(currentTiddler)$ -\end -\define tabs-state-macro() -$(popup-state)$-$(pluginInfoType)$ -\end -\define plugin-icon-title() -$(currentTiddler)$/icon -\end -\define plugin-disable-title() -$:/config/Plugins/Disabled/$(currentTiddler)$ -\end -\define plugin-table-body(type,disabledMessage) -
-<$reveal type="nomatch" state=<> text="yes"> -<$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="yes"> -{{$:/core/images/right-arrow}} - - -<$reveal type="match" state=<> text="yes"> -<$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="no"> -{{$:/core/images/down-arrow}} - - -
-
-<$transclude tiddler=<> subtiddler=<>> -<$transclude tiddler="$:/core/images/plugin-generic-$type$"/> - -
-
-
-''<$view field="description"><$view field="title"/>'' $disabledMessage$ -
-
-<$view field="title"/> -
-
-<$view field="version"/> -
-
-\end -\define plugin-table(type) -<$set name="qualified-state" value=<>> -<$list filter="[!has[draft.of]plugin-type[$type$]sort[description]]" emptyMessage=<>> -<$set name="popup-state" value=<>> -<$reveal type="nomatch" state=<> text="yes"> -<$link to={{!!title}} class="tc-plugin-info"> -<> - - -<$reveal type="match" state=<> text="yes"> -<$link to={{!!title}} class="tc-plugin-info tc-plugin-info-disabled"> -<">> - - -<$reveal type="match" text="yes" state=<>> -
-<$list filter="[all[current]] -[[$:/core]]"> -
-<$reveal type="nomatch" state=<> text="yes"> -<$button set=<> setTo="yes" tooltip={{$:/language/ControlPanel/Plugins/Disable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Disable/Caption}}> -<> - - -<$reveal type="match" state=<> text="yes"> -<$button set=<> setTo="no" tooltip={{$:/language/ControlPanel/Plugins/Enable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Enable/Caption}}> -<> - - -
- -<$reveal type="nomatch" text="" state="!!list"> -<$macrocall $name="tabs" state=<> tabsList={{!!list}} default="readme" template="$:/core/ui/PluginInfo"/> - -<$reveal type="match" text="" state="!!list"> -No information provided - -
- - - - -\end - -! <> - -<> - -! <> - -<> - -! <> - -<> diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid new file mode 100644 index 000000000..e3c0cca67 --- /dev/null +++ b/core/ui/ControlPanel/Modals/AddPlugins.tid @@ -0,0 +1,116 @@ +title: $:/core/ui/ControlPanel/Modals/AddPlugins +subtitle: {{$:/core/images/download-button}} {{$:/language/ControlPanel/Plugins/Add/Caption}} + +\define lingo-base() $:/language/ControlPanel/Plugins/ + +\define install-plugin-button() +<$button> +<$action-sendmessage $message="tm-load-plugin-from-library" url={{!!url}} title={{$(assetInfo)$!!original-title}}/> +<$list filter="[get[original-title]get[version]]" variable="installedVersion" emptyMessage="""install"""> +reinstall + + +\end + +\define popup-state-macro() +$:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ +\end + +\define display-plugin-info(type) +<$set name="popup-state" value=<>> +
+
+<$reveal type="nomatch" state=<> text="yes"> +<$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="yes"> +{{$:/core/images/right-arrow}} + + +<$reveal type="match" state=<> text="yes"> +<$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="no"> +{{$:/core/images/down-arrow}} + + +
+
+<$list filter="[has[icon]]" emptyMessage="""<$transclude tiddler="$:/core/images/plugin-generic-$type$"/>"""> + + +
+
+

<$view tiddler=<> field="description"/>

+

<$view tiddler=<> field="original-title"/>

+
<$view tiddler=<> field="version"/>
+
+
+<> +
+
+<$reveal type="match" text="yes" state=<>> +
+
+<$list filter="[get[original-title]get[version]]" variable="installedVersion" emptyMessage="""This plugin is not currently installed"""> + +This plugin is already installed at version <$text text=<>/> + + +
+
+<$transclude tiddler=<> field="readme" mode="block"/> +
+
+ + +\end + +\define load-plugin-library-button() +<$button class="tc-btn-big-green"> +<$action-sendmessage $message="tm-load-plugin-library" url={{!!url}} infoTitlePrefix="$:/temp/RemoteAssetInfo/"/> +{{$:/core/images/chevron-right}} open plugin library + +\end + +\define display-server-assets(type) +Search: <$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input" focus="true"/> +<$reveal state="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" type="nomatch" text=""> +<$button class="tc-btn-invisible"> +<$action-setfield $tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" $field="text" $value=""/> +{{$:/core/images/close-button}} + + +
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/RemoteAssetInfo]server-url{!!url}original-plugin-type[$type$]search{$:/temp/RemoteAssetSearch/$(currentTiddler)$}sort[description]]" variable="assetInfo"> +<> + +
+\end + +\define display-server-connection() +<$list filter="[all[tiddlers+shadows]tag[$:/tags/ServerConnection]suffix{!!url}]" variable="connectionTiddler" emptyMessage=<>> + +<> + + +\end + +\define plugin-library-listing() +<$list filter="[all[tiddlers+shadows]tag[$:/tags/PluginLibrary]]"> +
+ +!! <$link><$transclude field="caption"><$view field="title"/> + +//<$view field="url"/>// + +<$transclude/> + +<> +
+ +\end + +<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> + +
+<> +
+ + diff --git a/core/ui/ControlPanel/Plugins.tid b/core/ui/ControlPanel/Plugins.tid deleted file mode 100644 index 41b31e635..000000000 --- a/core/ui/ControlPanel/Plugins.tid +++ /dev/null @@ -1,7 +0,0 @@ -title: $:/core/ui/ControlPanel/Plugins -tags: $:/tags/ControlPanel -caption: {{$:/language/ControlPanel/Plugins/Caption}} - -
-<> -
diff --git a/core/ui/ControlPanel/Plugins/Add/Languages.tid b/core/ui/ControlPanel/Plugins/Add/Languages.tid new file mode 100644 index 000000000..f4468e12d --- /dev/null +++ b/core/ui/ControlPanel/Plugins/Add/Languages.tid @@ -0,0 +1,4 @@ +title: $:/core/ui/ControlPanel/Plugins/Add/Languages +caption: {{$:/language/ControlPanel/Plugins/Languages/Caption}} (<$count filter="[all[tiddlers+shadows]tag[$:/tags/RemoteAssetInfo]server-url{!!url}original-plugin-type[language]]"/>) + +<> diff --git a/core/ui/ControlPanel/Plugins/Add/Plugins.tid b/core/ui/ControlPanel/Plugins/Add/Plugins.tid new file mode 100644 index 000000000..d5125e357 --- /dev/null +++ b/core/ui/ControlPanel/Plugins/Add/Plugins.tid @@ -0,0 +1,4 @@ +title: $:/core/ui/ControlPanel/Plugins/Add/Plugins +caption: {{$:/language/ControlPanel/Plugins/Plugins/Caption}} (<$count filter="[all[tiddlers+shadows]tag[$:/tags/RemoteAssetInfo]server-url{!!url}original-plugin-type[plugin]]"/>) + +<> diff --git a/core/ui/ControlPanel/Plugins/Add/Themes.tid b/core/ui/ControlPanel/Plugins/Add/Themes.tid new file mode 100644 index 000000000..3c6fb2f54 --- /dev/null +++ b/core/ui/ControlPanel/Plugins/Add/Themes.tid @@ -0,0 +1,4 @@ +title: $:/core/ui/ControlPanel/Plugins/Add/Themes +caption: {{$:/language/ControlPanel/Plugins/Themes/Caption}} (<$count filter="[all[tiddlers+shadows]tag[$:/tags/RemoteAssetInfo]server-url{!!url}original-plugin-type[theme]]"/>) + +<> diff --git a/core/ui/ControlPanel/Plugins/Installed/Languages.tid b/core/ui/ControlPanel/Plugins/Installed/Languages.tid new file mode 100644 index 000000000..e66d04ef3 --- /dev/null +++ b/core/ui/ControlPanel/Plugins/Installed/Languages.tid @@ -0,0 +1,4 @@ +title: $:/core/ui/ControlPanel/Plugins/Installed/Languages +caption: {{$:/language/ControlPanel/Plugins/Languages/Caption}} (<$count filter="[!has[draft.of]plugin-type[language]]"/>) + +<> diff --git a/core/ui/ControlPanel/Plugins/Installed/Plugins.tid b/core/ui/ControlPanel/Plugins/Installed/Plugins.tid new file mode 100644 index 000000000..b603bb37b --- /dev/null +++ b/core/ui/ControlPanel/Plugins/Installed/Plugins.tid @@ -0,0 +1,4 @@ +title: $:/core/ui/ControlPanel/Plugins/Installed/Plugins +caption: {{$:/language/ControlPanel/Plugins/Plugins/Caption}} (<$count filter="[!has[draft.of]plugin-type[plugin]]"/>) + +<> diff --git a/core/ui/ControlPanel/Plugins/Installed/Themes.tid b/core/ui/ControlPanel/Plugins/Installed/Themes.tid new file mode 100644 index 000000000..fe52e7599 --- /dev/null +++ b/core/ui/ControlPanel/Plugins/Installed/Themes.tid @@ -0,0 +1,4 @@ +title: $:/core/ui/ControlPanel/Plugins/Installed/Themes +caption: {{$:/language/ControlPanel/Plugins/Themes/Caption}} (<$count filter="[!has[draft.of]plugin-type[theme]]"/>) + +<> diff --git a/editions/pluginlibrary/tiddlywiki.info b/editions/pluginlibrary/tiddlywiki.info index f8abf8c79..b47af15ff 100644 --- a/editions/pluginlibrary/tiddlywiki.info +++ b/editions/pluginlibrary/tiddlywiki.info @@ -10,8 +10,8 @@ "build": { "library": [ "--makelibrary","$:/UpgradeLibrary", - "--savelibrarytiddlers","$:/UpgradeLibrary","recipes/default/tiddlers/","$:/UpgradeLibrary/List", - "--savetiddler","$:/UpgradeLibrary/List","recipes/default/tiddlers.json", + "--savelibrarytiddlers","$:/UpgradeLibrary","[prefix[$:/]] -[[$:/plugins/tiddlywiki/upgrade]] -[[$:/plugins/tiddlywiki/translators]] -[[$:/plugins/tiddlywiki/pluginlibrary]] -[[$:/plugins/tiddlywiki/jasmine]]","recipes/library/tiddlers/","$:/UpgradeLibrary/List", + "--savetiddler","$:/UpgradeLibrary/List","recipes/library/tiddlers.json", "--rendertiddler","$:/plugins/tiddlywiki/pluginlibrary/library.template.html","index.html","text/plain"] } } diff --git a/plugins/tiddlywiki/pluginlibrary/libraryserver.js b/plugins/tiddlywiki/pluginlibrary/libraryserver.js index 6ad7fcb11..4f5f3e2ec 100644 --- a/plugins/tiddlywiki/pluginlibrary/libraryserver.js +++ b/plugins/tiddlywiki/pluginlibrary/libraryserver.js @@ -18,8 +18,8 @@ window.addEventListener("message",function listener(event){ console.log("plugin library: Message content",event.data); switch(event.data.verb) { case "GET": - if(event.data.url === "recipes/default/tiddlers.json") { - // Route for recipes/default/tiddlers.json + if(event.data.url === "recipes/library/tiddlers.json") { + // Route for recipes/library/tiddlers.json event.source.postMessage({ verb: "GET-RESPONSE", status: "200", @@ -28,9 +28,9 @@ window.addEventListener("message",function listener(event){ type: "application/json", body: JSON.stringify(assetList,null,4) },"*"); - } else if(event.data.url.indexOf("recipes/default/tiddlers/") === 0) { - var url = "recipes/default/tiddlers/" + encodeURIComponent(removePrefix(event.data.url,"recipes/default/tiddlers/")); - // Route for recipes/default/tiddlers/.json + } else if(event.data.url.indexOf("recipes/library/tiddlers/") === 0) { + var url = "recipes/library/tiddlers/" + encodeURIComponent(removePrefix(event.data.url,"recipes/library/tiddlers/")); + // Route for recipes/library/tiddlers/.json httpGet(url,function(err,responseText) { if(err) { event.source.postMessage({ diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index 40bb623be..cb8da020b 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -114,5 +114,5 @@ canvas.tc-edit-bitmapeditor { } .tc-plugin-info { - <> + <> } diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 6336c9790..8b2aafa41 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1110,6 +1110,11 @@ canvas.tc-edit-bitmapeditor { line-height: 30px; } +.tc-modal-header img, .tc-modal-header svg { + width: 1em; + height: 1em; +} + .tc-modal-body { padding: 15px; } @@ -1330,8 +1335,8 @@ canvas.tc-edit-bitmapeditor { display: block; border: 1px solid <>; background-colour: <>; - margin: 1em 0 1em 0; - padding: 8px; + margin: 0.5em 0 0.5em 0; + padding: 4px; } .tc-plugin-info-disabled { @@ -1360,16 +1365,46 @@ a.tc-tiddlylink.tc-plugin-info:hover svg { vertical-align: middle; } -a.tc-plugin-info img, a.tc-plugin-info svg { +.tc-plugin-info-chunk h1 { + font-size: 1em; + margin: 2px 0 2px 0; +} + +.tc-plugin-info-chunk h2 { + font-size: 0.8em; + margin: 2px 0 2px 0; +} + +.tc-plugin-info-chunk div { + font-size: 0.7em; + margin: 2px 0 2px 0; +} + +.tc-plugin-info img, .tc-plugin-info svg { width: 2em; height: 2em; fill: <>; } +.tc-plugin-info.tc-small-icon img, .tc-plugin-info.tc-small-icon svg { + width: 1em; + height: 1em; +} + .tc-plugin-info-dropdown { border: 1px solid <>; + margin-top: -8px; +} + +.tc-plugin-info-dropdown-message { + background: <>; + padding: 0.5em 1em 0.5em 1em; + font-weight: bold; + font-size: 0.8em; +} + +.tc-plugin-info-dropdown-body { padding: 1em 1em 1em 1em; - margin-top: -1em; } /*