diff --git a/core/images/cloud.tid b/plugins/tiddlywiki/tiddlyweb/icon-cloud.tid similarity index 64% rename from core/images/cloud.tid rename to plugins/tiddlywiki/tiddlyweb/icon-cloud.tid index f4520492bf..b7d838b766 100644 --- a/core/images/cloud.tid +++ b/plugins/tiddlywiki/tiddlyweb/icon-cloud.tid @@ -1,10 +1,11 @@ -title: $:/core/images/cloud +title: $:/plugins/tiddlywiki/tiddlyweb/icon/cloud tags: $:/tags/Image + - + \ No newline at end of file diff --git a/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid b/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid index dd23e5ee74..2b77c150b5 100644 --- a/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid +++ b/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid @@ -1,6 +1,6 @@ title: $:/core/ui/Buttons/save-wiki tags: $:/tags/PageControls -caption: {{$:/core/images/cloud-sync}} Server status +caption: {{$:/plugins/tiddlywiki/tiddlyweb/icon/cloud}} Server status description: Status of synchronisation with server \define config-title() @@ -9,7 +9,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$button popup=<> tooltip="Status of synchronisation with server" aria-label="Server status" class=<> selectedClass="tc-selected"> <$list filter="[match[yes]]"> -{{$:/core/images/cloud}} +{{$:/plugins/tiddlywiki/tiddlyweb/icon/cloud}} <$list filter="[match[yes]]"> <$text text="Server status"/> @@ -25,7 +25,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$reveal state="$:/status/IsLoggedIn" type="match" text="yes">

-Currently logged in<$reveal state="$:/status/UserName" type="nomatch" text="" default=""> as <$text text={{$:/status/UserName}}/><$reveal state="$:/status/IsReadOnly" type="match" text="yes" default="no"> (read-only) +You are logged in<$reveal state="$:/status/UserName" type="nomatch" text="" default=""> as <$text text={{$:/status/UserName}}/><$reveal state="$:/status/IsReadOnly" type="match" text="yes" default="no"> (read-only)


<$button tooltip="Get latest changes from the server" aria-label="Refresh from server" class="tc-btn-invisible"> @@ -34,7 +34,7 @@ Currently logged in<$reveal state="$:/status/UserName" type="nomatch" text="" de <$button class="tc-btn-invisible"> <$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}> - <$action-sendmessage $message="tm-download-file" $param={{$:/config/SaveWikiButton/Template}} filename=<>/> +<$action-sendmessage $message="tm-download-file" $param={{$:/config/SaveWikiButton/Template}} filename=<>/> {{$:/core/images/download-button}} Save snapshot for offline use diff --git a/plugins/tiddlywiki/tiddlyweb/styles.tid b/plugins/tiddlywiki/tiddlyweb/styles.tid new file mode 100644 index 0000000000..be3df31dbc --- /dev/null +++ b/plugins/tiddlywiki/tiddlyweb/styles.tid @@ -0,0 +1,64 @@ +title: $:/plugins/tiddlywiki/tiddlyweb/styles +tags: [[$:/tags/Stylesheet]] + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock + +body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg { + transition: fill 250ms ease-in-out; +} + +body .tc-image-cloud-idle { + fill: <>; + transition: opacity 450ms linear; + opacity: 1; +} + +body.tc-dirty .tc-image-cloud-idle { + opacity: 0; +} + +body .tc-image-cloud-progress { + transition: opacity 450ms linear; + transform-origin: 50% 50%; + transform: rotate(359deg); + animation: animation-rotate-slow 2s infinite linear; + fill: <>; + opacity: 0; +} + +body.tc-dirty .tc-image-cloud-progress { + opacity: 1; +} + +body .tc-image-cloud-error { + transition: opacity 450ms linear; + transform-origin: 50% 50%; + animation: animation-pulse-fast 0.7s infinite linear; + fill: <>; + opacity: 0; +} + +body.tc-dirty .tc-image-cloud-error { + opacity: 0; +} + +@keyframes animation-rotate-slow { + from { + transform: rotate(0deg); + } + to { + transform: scale(359deg); + } +} + +@keyframes animation-pulse-fast { + 0% { + transform: scale(0.3); + } + 50% { + transform: scale(0.8); + } + 100% { + transform: scale(1.5); + } +} diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index 930ade73c1..4bdff613e0 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -107,38 +107,3 @@ canvas.tc-edit-bitmapeditor { .tc-plugin-info { <> } - -.tc-animate-rotate-slow { - transform-origin: 50% 50%; - transform: rotate(359deg); - animation: rotate-slow 2s infinite linear; -} - -@keyframes rotate-slow { - from { - transform: rotate(0deg); - } - to { - transform: scale(359deg); - } -} - -.tc-animate-pulse-fast { - transform-origin: 50% 50%; - animation: pulse-fast 0.7s infinite linear; -} - -@keyframes pulse-fast { - 0% { - transform: scale(0.3); - opacity: 0.25; - } - 50% { - transform: scale(0.8); - opacity: 1; - } - 100% { - transform: scale(1); - opacity: 0.25; - } -} diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index b17e8d3b15..0e7be8ebc0 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -2462,31 +2462,10 @@ input.tc-palette-manager-colour-input { */ body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg { - transition: fill 250ms ease-in-out; color: <>; fill: <>; } -body .tc-image-cloud-progress { - fill: <>; - transition: opacity 450ms linear; - opacity: 0; -} - -body.tc-dirty .tc-image-cloud-progress { - opacity: 1; -} - -body .tc-image-cloud-error { - fill: <>; - transition: fill 450ms linear, opacity 450ms linear; - opacity: 0; -} - -body.tc-dirty .tc-image-cloud-error { - opacity: 0; -} - /* ** File inputs */