mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 18:17:20 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fr-FR

Browse Source
This commit is contained in:
Xavier Cazin 2014-08-02 23:37:58 +02:00
commit 33b4851d0f
12 changed files with 72 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/images/theme-button.tid Normal file
View File

@ -0,0 +1,12 @@
title: $:/core/images/theme-button
tags: $:/tags/Image
<svg class="tw-image-theme-button tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 129">
<g fill-rule="evenodd">
<g transform="translate(6.762422, 19.968999)">
<path d="M0.824945506,108.186742 C0.664785639,108.187747 0.504640965,108.188251 0.344516735,108.188251 C24.6927592,97.3230528 16.4618388,61.4785938 43.121606,61.4785936 C43.3514982,62.5099075 43.5895175,63.6196137 43.8937798,64.7474092 C25.0518979,61.7172401 26.754298,99.6790423 0.824939051,108.186742 Z M1.34304326,108.181747 C29.613352,107.814217 58.1805158,91.9297101 58.1805151,75.5906019 C51.4386888,75.5906018 47.9457839,73.0599394 45.9513275,69.8149659 C33.880418,64.7217657 23.8678719,103.061726 1.34301955,108.181748 Z"></path>
<path d="M48.871084,61.6312522 C45.6348746,64.6233738 52.4243955,73.581882 57.1020034,69.8621716 C65.3329228,61.631253 108.502656,20.4006304 116.733576,12.169711 C124.964495,3.9387916 116.733576,-4.29212771 108.502656,3.9387916 C100.271737,12.1697108 57.4180113,53.7289683 48.871084,61.6312522 Z"></path>
</g>
<path d="M62.2824054,71.6211067 C57.93733,66.8541323 54.3123948,62.6301561 51.9937779,59.5814279 C41.5433616,45.8402704 36.2721798,53.0755512 30.307554,59.5814276 C24.3429282,66.0873041 31.8788571,71.3587209 26.2181932,75.9543964 C20.5575294,80.5500719 20.9070004,82.1430826 11.3532982,73.7355757 C1.79959591,65.3280689 1.13881905,63.0132479 5.52449152,58.2159872 C9.91016399,53.4187265 13.5756887,60.9722938 22.5346144,52.4469667 C31.4935401,43.9216395 23.9676854,36.3658236 23.9676854,36.3658236 C23.9676854,36.3658236 42.6210998,-1.76571499 67.5465342,1.05058165 C92.4719685,3.8668783 58.1171911,-2.5961653 49.5716499,27.3088291 C45.9128772,40.1126497 50.2525733,37.0956468 57.1903023,42.5036084 C59.4792141,44.2878157 67.5103988,50.0176866 77.2457031,57.2905766 C71.4143155,62.9019825 66.2337717,67.8661661 62.2824054,71.6211067 Z M73.4870997,83.4678852 C87.4278174,97.7290403 103.323635,112.360587 109.285731,114.539289 C119.139459,118.140092 123.820369,111.571999 123.820368,100.570289 C123.820367,94.7414103 107.064445,80.3074425 90.2759123,67.2185217 C83.6390655,73.6178 77.7700759,79.2918373 73.4870997,83.4678852 Z"></path>
</g>
</svg>

2
core/language/en-GB/Buttons.multids
View File

@ -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

4
core/ui/PageControls/more-page-actions.tid
View File

@ -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=<<config-title>> text="hide">
@ -36,6 +38,8 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
</$set>
</$set>
</div>
</$reveal>

32
core/ui/PageControls/theme.tid Normal file
View File

@ -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=<<qualify "$:/state/popup/theme">> title={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/theme-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Theme/Caption}}/>
</$list>
</$button>
<$reveal state=<<qualify "$:/state/popup/theme">> type="popup" position="below" animate="yes">
<div class="tw-drop-down">
<$linkcatcher to="$:/theme">
<$list filter="[plugin-type[theme]sort[title]]" variable="themeTitle">
<$link to=<<themeTitle>>>
<span class="tw-drop-down-bullet">
<$reveal type="match" state="$:/theme" text=<<themeTitle>>>
&bull;
</$reveal>
<$reveal type="nomatch" state="$:/theme" text=<<themeTitle>>>
&nbsp;
</$reveal>
</span>
<$view tiddler=<<themeTitle>> field="name"/>
</$link>
</$list>
</$linkcatcher>
</div>
</$reveal>

4
core/ui/SideBar/Tools.tid
View File

@ -26,7 +26,3 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
</$set>
</$set>
---
{{$:/snippets/minithemeswitcher}}

1
core/wiki/config/PageControlButtons.multids
View File

@ -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

2
core/wiki/tags/PageControls.tid
View File

@ -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]]

2
languages/zh-Hans/Buttons.multids
View File

@ -28,6 +28,8 @@ FullScreen/Caption: 全屏幕
FullScreen/Hint: 进入或离开全屏模式
Home/Caption: 首页
Home/Hint: 刷新页面且开启首页条目
Import/Caption: 导入
Import/Hint: 导入文件
Info/Caption: 信息
Info/Hint: 显示此条目的信息
Language/Caption: 语言

7
languages/zh-Hans/Import.multids
View File

@ -6,7 +6,8 @@ Listing/Import/Caption: 导入
Listing/Select/Caption: 选择
Listing/Status/Caption: 状态
Listing/Title/Caption: 条目
Upgrader/Plugins/Suppressed/Version: 排除插件 (由于传入的 <<incoming>> 较现有版本 <<existing>> 旧)
Upgrader/Plugins/Suppressed/Incompatible: 封锁的不相容或过时插件
Upgrader/Plugins/Suppressed/Version: 封锁的插件 (由于传入的 <<incoming>> 较现有版本 <<existing>> 旧)
Upgrader/Plugins/Upgraded: 升级插件，从 <<incoming>> 到 <<upgraded>>
Upgrader/System/Suppressed: 排除系统条目
Upgrader/ThemeTweaks/Created: 從 <$text text=<<from>>/> 遷移佈景主題
Upgrader/System/Suppressed: 封锁的系统条目
Upgrader/ThemeTweaks/Created: 从 <$text text=<<from>>/> 迁移布景主题

2
languages/zh-Hant/Buttons.multids
View File

@ -28,6 +28,8 @@ FullScreen/Caption: 全螢幕
FullScreen/Hint: 進入或離開全螢幕模式
Home/Caption: 首頁
Home/Hint: 刷新頁面且開啟首頁條目
Import/Caption: 導入
Import/Hint: 導入檔案
Info/Caption: 資訊
Info/Hint: 顯示此條目的資訊
Language/Caption: 語言

5
languages/zh-Hant/Import.multids
View File

@ -6,7 +6,8 @@ Listing/Import/Caption: 導入
Listing/Select/Caption: 選擇
Listing/Status/Caption: 狀態
Listing/Title/Caption: 條目
Upgrader/Plugins/Suppressed/Version: 排除插件 (由於傳入的 <<incoming>> 較現有版本 <<existing>> 舊)
Upgrader/Plugins/Suppressed/Incompatible: 封鎖的不相容或過時插件
Upgrader/Plugins/Suppressed/Version: 封鎖的插件 (由於傳入的 <<incoming>> 較現有版本 <<existing>> 舊)
Upgrader/Plugins/Upgraded: 升級插件，從 <<incoming>> 到 <<upgraded>>
Upgrader/System/Suppressed: 排除系統條目
Upgrader/System/Suppressed: 封鎖的系統條目
Upgrader/ThemeTweaks/Created: 從 <$text text=<<from>>/> 遷移佈景主題

10
themes/tiddlywiki/vanilla/base.tid
View File

@ -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: <<colour foreground>>;
}
.tw-drop-down a:hover, .tw-drop-down button:hover, .tw-drop-down .tw-file-input-wrapper:hover button {
color: <<colour tiddler-link-background>>;
background-color: <<colour tiddler-link-foreground>>;
text-decoration: none;