Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-26 08:54:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-06-25 23:47:43 +08:00
commit c78ac2edc2
5 changed files with 67 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.sy
View file

@ -4,7 +4,7 @@
"Properties": {
"id": "20210615213222-vs5tzbd",
"title": "Data history",
"updated": "20220615120852"
"updated": "20220625231856"
},
"Children": [
{
@ -552,7 +552,7 @@
"ListData": {},
"Properties": {
"id": "20220501135308-3azjqzh",
"updated": "20220615120419"
"updated": "20220625231844"
},
"Children": [
{
@ -564,7 +564,7 @@
},
"Properties": {
"id": "20220501135308-itmzgsj",
"updated": "20220615120419"
"updated": "20220625231844"
},
"Children": [
{
@ -572,12 +572,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220501135308-yvsiton",
"updated": "20220615120419"
"updated": "20220625231844"
},
"Children": [
{
"Type": "NodeText",
"Data": "At the top "
"Data": "Click the "
},
{
"Type": "NodeKbd",
@ -588,7 +588,7 @@
},
{
"Type": "NodeText",
"Data": "..."
"Data": "Data History"
},
{
"Type": "NodeKbdCloseMarker"
@ -597,7 +597,7 @@
},
{
"Type": "NodeText",
"Data": " menu or "
"Data": " button on the top toolbar or "
},
{
"Type": "NodeKbd",
@ -1400,7 +1400,7 @@
},
"Properties": {
"id": "20220615120602-5r3nl34",
"updated": "20220615120840"
"updated": "20220625231856"
},
"Children": [
{
@ -1414,7 +1414,7 @@
},
"Properties": {
"id": "20220615120602-a20qin2",
"updated": "20220615120602"
"updated": "20220625231856"
},
"Children": [
{
@ -1422,12 +1422,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220615120602-k0xs8n5",
"updated": "20220615120602"
"updated": "20220625231856"
},
"Children": [
{
"Type": "NodeText",
"Data": "On the top "
"Data": "Click the "
},
{
"Type": "NodeKbd",
@ -1438,7 +1438,7 @@
},
{
"Type": "NodeText",
"Data": "..."
"Data": "Data History"
},
{
"Type": "NodeKbdCloseMarker"
@ -1447,7 +1447,7 @@
},
{
"Type": "NodeText",
"Data": " menu or "
"Data": " button on the top toolbar or "
},
{
"Type": "NodeKbd",

26
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.sy
View file

@ -4,7 +4,7 @@
"Properties": {
"id": "20210615211733-v6rzowm",
"title": "数据历史",
"updated": "20220615120214"
"updated": "20220625231706"
},
"Children": [
{
@ -572,7 +572,7 @@
"ListData": {},
"Properties": {
"id": "20210104090742-8rmcz3i",
"updated": "20220615112450"
"updated": "20220625231706"
},
"Children": [
{
@ -584,7 +584,7 @@
},
"Properties": {
"id": "20220501135052-k47n4ms",
"updated": "20220615112450"
"updated": "20220625231706"
},
"Children": [
{
@ -592,12 +592,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220501135052-o3r30jj",
"updated": "20220615112450"
"updated": "20220625231706"
},
"Children": [
{
"Type": "NodeText",
"Data": "在顶部 "
"Data": "点击顶部工具栏 "
},
{
"Type": "NodeKbd",
@ -608,7 +608,7 @@
},
{
"Type": "NodeText",
"Data": "..."
"Data": "数据历史"
},
{
"Type": "NodeKbdCloseMarker"
@ -617,7 +617,7 @@
},
{
"Type": "NodeText",
"Data": " 菜单或者 "
"Data": " 按钮或者 "
},
{
"Type": "NodeKbd",
@ -1420,7 +1420,7 @@
},
"Properties": {
"id": "20220615112933-zoh8iyg",
"updated": "20220615120214"
"updated": "20220625231649"
},
"Children": [
{
@ -1434,7 +1434,7 @@
},
"Properties": {
"id": "20220615114246-9or7h68",
"updated": "20220615114246"
"updated": "20220625231649"
},
"Children": [
{
@ -1442,12 +1442,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220615114246-lr3ydl0",
"updated": "20220615114250"
"updated": "20220625231649"
},
"Children": [
{
"Type": "NodeText",
"Data": "在顶部 "
"Data": "点击顶部工具栏 "
},
{
"Type": "NodeKbd",
@ -1458,7 +1458,7 @@
},
{
"Type": "NodeText",
"Data": "..."
"Data": "数据历史"
},
{
"Type": "NodeKbdCloseMarker"
@ -1467,7 +1467,7 @@
},
{
"Type": "NodeText",
"Data": " 菜单或者 "
"Data": " 按钮或者 "
},
{
"Type": "NodeKbd",

26
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.sy
View file

@ -4,7 +4,7 @@
"Properties": {
"id": "20211226122707-8cr09co",
"title": "數據歷史",
"updated": "20220615120430"
"updated": "20220625231923"
},
"Children": [
{
@ -552,7 +552,7 @@
"ListData": {},
"Properties": {
"id": "20220501135134-lh5drjl",
"updated": "20220615120430"
"updated": "20220625231918"
},
"Children": [
{
@ -564,7 +564,7 @@
},
"Properties": {
"id": "20220501135134-nkzl4wl",
"updated": "20220615120430"
"updated": "20220625231918"
},
"Children": [
{
@ -572,12 +572,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220501135134-n7t2zfn",
"updated": "20220615120430"
"updated": "20220625231918"
},
"Children": [
{
"Type": "NodeText",
"Data": "在頂部 "
"Data": "點擊頂部工具欄 "
},
{
"Type": "NodeKbd",
@ -588,7 +588,7 @@
},
{
"Type": "NodeText",
"Data": "..."
"Data": "數據歷史"
},
{
"Type": "NodeKbdCloseMarker"
@ -597,7 +597,7 @@
},
{
"Type": "NodeText",
"Data": " 菜單或者 "
"Data": " 按鈕或者 "
},
{
"Type": "NodeKbd",
@ -1400,7 +1400,7 @@
},
"Properties": {
"id": "20220615120134-rfk9khd",
"updated": "20220615120216"
"updated": "20220625231923"
},
"Children": [
{
@ -1414,7 +1414,7 @@
},
"Properties": {
"id": "20220615120134-1uthigi",
"updated": "20220615120134"
"updated": "20220625231923"
},
"Children": [
{
@ -1422,12 +1422,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220615120134-7n3iucn",
"updated": "20220615120134"
"updated": "20220625231923"
},
"Children": [
{
"Type": "NodeText",
"Data": "在頂部 "
"Data": "點擊頂部工具欄 "
},
{
"Type": "NodeKbd",
@ -1438,7 +1438,7 @@
},
{
"Type": "NodeText",
"Data": "..."
"Data": "數據歷史"
},
{
"Type": "NodeKbdCloseMarker"
@ -1447,7 +1447,7 @@
},
{
"Type": "NodeText",
"Data": " 菜單或者 "
"Data": " 按鈕或者 "
},
{
"Type": "NodeKbd",

10
app/src/util/onGetConfig.ts
View file

@ -286,16 +286,16 @@ const initBar = () => {
<use xlink:href="#iconMoon"></use>
</svg>
</div>
<div id="barSetting" class="toolbar__item b3-tooltips b3-tooltips__se${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.config} ${updateHotkeyTip(window.siyuan.config.keymap.general.config.custom)}">
<svg>
<use xlink:href="#iconSettings"></use>
</svg>
</div>
<div id="barHistory" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.dataHistory} ${updateHotkeyTip(window.siyuan.config.keymap.general.history.custom)}">
<svg>
<use xlink:href="#iconVideo"></use>
</svg>
</div>
<div id="barSetting" class="toolbar__item b3-tooltips b3-tooltips__se${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.config} ${updateHotkeyTip(window.siyuan.config.keymap.general.config.custom)}">
<svg>
<use xlink:href="#iconSettings"></use>
</svg>
</div>
<div id="barDebug" class="toolbar__item b3-tooltips b3-tooltips__se fn__none" aria-label="${window.siyuan.languages.debug}">
<svg>
<use xlink:href="#iconBug"></use>