diff --git a/core/images/theme-button.tid b/core/images/theme-button.tid new file mode 100644 index 000000000..419a10924 --- /dev/null +++ b/core/images/theme-button.tid @@ -0,0 +1,12 @@ +title: $:/core/images/theme-button +tags: $:/tags/Image + + + + + + + + + + \ No newline at end of file diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index 28b17e19a..80ceeb032 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -52,3 +52,5 @@ HideSideBar/Caption: hide sidebar HideSideBar/Hint: Hide sidebar ShowSideBar/Caption: show sidebar ShowSideBar/Hint: Show sidebar +Theme/Caption: theme +Theme/Hint: Choose the display theme diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid index 68eece585..24ffe8380 100644 --- a/core/ui/PageControls/more-page-actions.tid +++ b/core/ui/PageControls/more-page-actions.tid @@ -22,6 +22,8 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$set name="tw-config-toolbar-text" value="yes"> +<$set name="tw-config-toolbar-class" value="btn-invisible"> + <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]" variable="listItem"> <$reveal type="match" state=<> text="hide"> @@ -36,6 +38,8 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ + + diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid new file mode 100644 index 000000000..21296bb14 --- /dev/null +++ b/core/ui/PageControls/theme.tid @@ -0,0 +1,32 @@ +title: $:/core/ui/Buttons/theme +tags: $:/tags/PageControls +caption: {{$:/core/images/theme-button}} {{$:/language/Buttons/Theme/Caption}} +description: {{$:/language/Buttons/Theme/Hint}} + +<$button popup=<> title={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<> selectedClass="tw-selected"> +<$list filter="[prefix[yes]]"> +{{$:/core/images/theme-button}} + +<$list filter="[prefix[yes]]"> +<$text text={{$:/language/Buttons/Theme/Caption}}/> + + +<$reveal state=<> type="popup" position="below" animate="yes"> +
+<$linkcatcher to="$:/theme"> +<$list filter="[plugin-type[theme]sort[title]]" variable="themeTitle"> +<$link to=<>> + +<$reveal type="match" state="$:/theme" text=<>> +• + +<$reveal type="nomatch" state="$:/theme" text=<>> +  + + +<$view tiddler=<> field="name"/> + + + +
+ diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid index d49060b6e..1c1cd7ea6 100644 --- a/core/ui/SideBar/Tools.tid +++ b/core/ui/SideBar/Tools.tid @@ -26,7 +26,3 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ - ---- - -{{$:/snippets/minithemeswitcher}} diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids index ab191578e..d15149785 100644 --- a/core/wiki/config/PageControlButtons.multids +++ b/core/wiki/config/PageControlButtons.multids @@ -9,3 +9,4 @@ core/ui/Buttons/language: hide core/ui/Buttons/more-page-actions: hide core/ui/Buttons/permaview: hide core/ui/Buttons/storyview: hide +core/ui/Buttons/theme: hide diff --git a/core/wiki/tags/PageControls.tid b/core/wiki/tags/PageControls.tid index af98a288b..49b346080 100644 --- a/core/wiki/tags/PageControls.tid +++ b/core/wiki/tags/PageControls.tid @@ -1,2 +1,2 @@ title: $:/tags/PageControls -list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/more-page-actions]] +list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/more-page-actions]] diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index 2f70a959b..d608a4ba9 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -28,6 +28,8 @@ FullScreen/Caption: 全屏幕 FullScreen/Hint: 进入或离开全屏模式 Home/Caption: 首页 Home/Hint: 刷新页面且开启首页条目 +Import/Caption: 导入 +Import/Hint: 导入文件 Info/Caption: 信息 Info/Hint: 显示此条目的信息 Language/Caption: 语言 diff --git a/languages/zh-Hans/Import.multids b/languages/zh-Hans/Import.multids index 6b4757c70..4afdfeabf 100644 --- a/languages/zh-Hans/Import.multids +++ b/languages/zh-Hans/Import.multids @@ -6,7 +6,8 @@ Listing/Import/Caption: 导入 Listing/Select/Caption: 选择 Listing/Status/Caption: 状态 Listing/Title/Caption: 条目 -Upgrader/Plugins/Suppressed/Version: 排除插件 (由于传入的 <> 较现有版本 <> 旧) +Upgrader/Plugins/Suppressed/Incompatible: 封锁的不相容或过时插件 +Upgrader/Plugins/Suppressed/Version: 封锁的插件 (由于传入的 <> 较现有版本 <> 旧) Upgrader/Plugins/Upgraded: 升级插件，从 <> 到 <> -Upgrader/System/Suppressed: 排除系统条目 -Upgrader/ThemeTweaks/Created: 從 <$text text=<>/> 遷移佈景主題 +Upgrader/System/Suppressed: 封锁的系统条目 +Upgrader/ThemeTweaks/Created: 从 <$text text=<>/> 迁移布景主题 diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index 002cfff1e..621667495 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -28,6 +28,8 @@ FullScreen/Caption: 全螢幕 FullScreen/Hint: 進入或離開全螢幕模式 Home/Caption: 首頁 Home/Hint: 刷新頁面且開啟首頁條目 +Import/Caption: 導入 +Import/Hint: 導入檔案 Info/Caption: 資訊 Info/Hint: 顯示此條目的資訊 Language/Caption: 語言 diff --git a/languages/zh-Hant/Import.multids b/languages/zh-Hant/Import.multids index e80736b4c..6b01cf674 100644 --- a/languages/zh-Hant/Import.multids +++ b/languages/zh-Hant/Import.multids @@ -6,7 +6,8 @@ Listing/Import/Caption: 導入 Listing/Select/Caption: 選擇 Listing/Status/Caption: 狀態 Listing/Title/Caption: 條目 -Upgrader/Plugins/Suppressed/Version: 排除插件 (由於傳入的 <> 較現有版本 <> 舊) +Upgrader/Plugins/Suppressed/Incompatible: 封鎖的不相容或過時插件 +Upgrader/Plugins/Suppressed/Version: 封鎖的插件 (由於傳入的 <> 較現有版本 <> 舊) Upgrader/Plugins/Upgraded: 升級插件，從 <> 到 <> -Upgrader/System/Suppressed: 排除系統條目 +Upgrader/System/Suppressed: 封鎖的系統條目 Upgrader/ThemeTweaks/Created: 從 <$text text=<>/> 遷移佈景主題 diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 00ffb28f9..0c5d9610b 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -896,7 +896,15 @@ canvas.tw-edit-bitmapeditor { line-height: 1.4; } -.tw-drop-down a:hover, .tw-drop-down button:hover { +.tw-drop-down .tw-file-input-wrapper { + width: 100%; +} + +.tw-drop-down .tw-file-input-wrapper button { + color: <>; +} + +.tw-drop-down a:hover, .tw-drop-down button:hover, .tw-drop-down .tw-file-input-wrapper:hover button { color: <>; background-color: <>; text-decoration: none;