Zane/obsidian-notes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vault backup: 2023-04-19 09:52:40

Browse Source
This commit is contained in:
zzz
2023-04-19 09:52:40 +08:00
parent f2cf4b537f
commit f31f7ad756
17 changed files with 32447 additions and 9462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.obsidian/app.json vendored
View File

@@ -1,11 +1,3 @@
{ {
"promptDelete": false, "promptDelete": false
"attachmentFolderPath": "FGui/图片",
"pdfExportSettings": {
"includeName": true,
"pageSize": "Letter",
"landscape": false,
"margin": "0",
"downscalePercent": 100
}
} }

3
.obsidian/appearance.json vendored
View File

@@ -1,4 +1,3 @@
{ {
"accentColor": "", "accentColor": ""
"baseFontSize": 16
} }

5
.obsidian/community-plugins.json vendored
View File

@@ -1,5 +1,4 @@
[ [
"obsidian-kanban", "obsidian-version-history-diff",
"obsidian-git", "obsidian-git"
"calendar"
] ]

18
.obsidian/core-plugins-migration.json vendored
View File

@@ -4,26 +4,26 @@
"switcher": true, "switcher": true,
"graph": true, "graph": true,
"backlink": true, "backlink": true,
"outgoing-link": false, "canvas": true,
"tag-pane": false, "outgoing-link": true,
"tag-pane": true,
"page-preview": true, "page-preview": true,
"daily-notes": false, "daily-notes": true,
"templates": false, "templates": true,
"note-composer": true, "note-composer": true,
"command-palette": true, "command-palette": true,
"slash-command": false, "slash-command": false,
"editor-status": true, "editor-status": true,
"starred": false, "starred": true,
"markdown-importer": true, "markdown-importer": false,
"zk-prefixer": false, "zk-prefixer": false,
"random-note": false, "random-note": false,
"outline": false, "outline": true,
"word-count": true, "word-count": true,
"slides": false, "slides": false,
"audio-recorder": false, "audio-recorder": false,
"workspaces": false, "workspaces": false,
"file-recovery": true, "file-recovery": true,
"publish": false, "publish": false,
"sync": false, "sync": false
"canvas": true
} }

7
.obsidian/core-plugins.json vendored
View File

@@ -5,11 +5,16 @@
"graph", "graph",
"backlink", "backlink",
"canvas", "canvas",
"outgoing-link",
"tag-pane",
"page-preview", "page-preview",
"daily-notes",
"templates",
"note-composer", "note-composer",
"command-palette", "command-palette",
"editor-status", "editor-status",
"markdown-importer", "starred",
"outline",
"word-count", "word-count",
"file-recovery" "file-recovery"
] ]

14
.obsidian/plugins/obsidian-git/data.json vendored
View File

@@ -1,6 +1,5 @@
{ {
"commitMessage": "vault backup: {{date}}", "commitMessage": "vault backup: {{date}}",
"autoCommitMessage": "vault backup: {{date}}",
"commitDateFormat": "YYYY-MM-DD HH:mm:ss", "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
"autoSaveInterval": 0, "autoSaveInterval": 0,
"autoPushInterval": 0, "autoPushInterval": 0,
@@ -13,12 +12,19 @@
"showStatusBar": true, "showStatusBar": true,
"updateSubmodules": false, "updateSubmodules": false,
"syncMethod": "merge", "syncMethod": "merge",
"gitPath": "",
"customMessageOnAutoBackup": false, "customMessageOnAutoBackup": false,
"autoBackupAfterFileChange": false, "autoBackupAfterFileChange": false,
"treeStructure": false, "treeStructure": true,
"refreshSourceControl": true, "refreshSourceControl": true,
"basePath": "", "basePath": "",
"differentIntervalCommitAndPush": false, "differentIntervalCommitAndPush": false,
"changedFilesInStatusBar": false "changedFilesInStatusBar": false,
"showedMobileNotice": true,
"refreshSourceControlTimer": 7000,
"showBranchStatusBar": true,
"setLastSaveToLastCommit": false,
"submoduleRecurseCheckout": false,
"gitDir": "",
"showFileMenu": true,
"autoCommitMessage": "vault backup: {{date}}"
} }

40508
.obsidian/plugins/obsidian-git/main.js vendored
View File

File diff suppressed because one or more lines are too long

7
.obsidian/plugins/obsidian-git/manifest.json vendored
View File

@@ -1,8 +1,9 @@
{ {
"id": "obsidian-git", "id": "obsidian-git",
"name": "Obsidian Git", "name": "Obsidian Git",
"description": "Backup your vault with git.", "description": "Backup your vault with Git.",
"isDesktopOnly": true, "isDesktopOnly": false,
"fundingUrl": "https://ko-fi.com/vinzent",
"js": "main.js", "js": "main.js",
"version": "1.26.1" "version": "2.19.1"
} }

594
.obsidian/plugins/obsidian-git/styles.css vendored
View File

@@ -1,413 +1,487 @@
@keyframes loading { @keyframes loading {
0% { 0% {
transform: rotate(0deg); transform: rotate(0deg);
} }
100% {
transform: rotate(360deg); 100% {
} transform: rotate(360deg);
}
} }
.loading > svg {
animation: 2s linear infinite loading; .workspace-leaf-content[data-type='git-view'] .view-content {
transform-origin: 50% 50%; padding: 0;
display: inline-block; }
.workspace-leaf-content[data-type='git-history-view'] .view-content {
padding: 0;
}
.loading>svg {
animation: 2s linear infinite loading;
transform-origin: 50% 50%;
display: inline-block;
} }
.obsidian-git-center { .obsidian-git-center {
margin: auto; margin: auto;
width: 50%; text-align: center;
width: 50%;
}
.obsidian-git-textarea {
display: block;
margin-left: auto;
margin-right: auto;
}
.obsidian-git-center-button {
display: block;
margin: 20px auto;
} }
.tooltip.mod-left { .tooltip.mod-left {
overflow-wrap: break-word; overflow-wrap: break-word;
} }
.tooltip.mod-right { .tooltip.mod-right {
overflow-wrap: break-word; overflow-wrap: break-word;
}
.git-tools {
display: flex;
margin-left: auto;
}
.git-tools .type {
padding-left: var(--size-2-1);
display: flex;
align-items: center;
justify-content: center;
width: 11px;
} }
.obsidian-git-shortcuts { .git-tools .type[data-type="M"] {
margin: 10px; color: orange;
} }
.git-tools .type[data-type="D"] {
.diff-err { color: red;
height: 100%;
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
} }
.git-tools .buttons {
.diff-err-sign { display: flex;
font-size: 2em; }
.git-tools .buttons > * {
padding: 0 0;
height: auto;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-d-none { .workspace-leaf-content[data-type="diff-view"] .d2h-d-none {
display: none; display: none;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-wrapper { .workspace-leaf-content[data-type="diff-view"] .d2h-wrapper {
text-align: left; text-align: left;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-header { .workspace-leaf-content[data-type="diff-view"] .d2h-file-header {
background-color: var(--background-primary); background-color: var(--background-primary);
border-bottom: 1px solid var(--interactive-accent); border-bottom: 1px solid var(--interactive-accent);
font-family: var(--font-monospace); font-family: var(--font-monospace);
height: 35px; height: 35px;
padding: 5px 10px; padding: 5px 10px;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-header, .workspace-leaf-content[data-type="diff-view"] .d2h-file-header,
.workspace-leaf-content[data-type="diff-view"] .d2h-file-stats { .workspace-leaf-content[data-type="diff-view"] .d2h-file-stats {
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-stats { .workspace-leaf-content[data-type="diff-view"] .d2h-file-stats {
font-size: 14px; font-size: 14px;
margin-left: auto; margin-left: auto;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-lines-added { .workspace-leaf-content[data-type="diff-view"] .d2h-lines-added {
border: 1px solid #b4e2b4; border: 1px solid #b4e2b4;
border-radius: 5px 0 0 5px; border-radius: 5px 0 0 5px;
color: #399839; color: #399839;
padding: 2px; padding: 2px;
text-align: right; text-align: right;
vertical-align: middle; vertical-align: middle;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-lines-deleted { .workspace-leaf-content[data-type="diff-view"] .d2h-lines-deleted {
border: 1px solid #e9aeae; border: 1px solid #e9aeae;
border-radius: 0 5px 5px 0; border-radius: 0 5px 5px 0;
color: #c33; color: #c33;
margin-left: 1px; margin-left: 1px;
padding: 2px; padding: 2px;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-name-wrapper { .workspace-leaf-content[data-type="diff-view"] .d2h-file-name-wrapper {
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
font-size: 15px; font-size: 15px;
width: 100%; width: 100%;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-name { .workspace-leaf-content[data-type="diff-view"] .d2h-file-name {
overflow-x: hidden; overflow-x: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-wrapper { .workspace-leaf-content[data-type="diff-view"] .d2h-file-wrapper {
border: 1px solid var(--background-modifier-border); border: 1px solid var(--background-modifier-border);
border-radius: 3px; border-radius: 3px;
margin-bottom: 1em; margin-bottom: 1em;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse { .workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse {
-webkit-box-pack: end; -webkit-box-pack: end;
-ms-flex-pack: end; -ms-flex-pack: end;
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
border: 1px solid var(--background-modifier-border); border: 1px solid var(--background-modifier-border);
border-radius: 3px; border-radius: 3px;
cursor: pointer; cursor: pointer;
display: none; display: none;
font-size: 12px; font-size: 12px;
justify-content: flex-end; justify-content: flex-end;
padding: 4px 8px; padding: 4px 8px;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse.d2h-selected { .workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse.d2h-selected {
background-color: #c8e1ff; background-color: #c8e1ff;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse-input { .workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse-input {
margin: 0 4px 0 0; margin: 0 4px 0 0;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-diff-table { .workspace-leaf-content[data-type="diff-view"] .d2h-diff-table {
border-collapse: collapse; border-collapse: collapse;
font-family: Menlo, Consolas, monospace; font-family: Menlo, Consolas, monospace;
font-size: 13px; font-size: 13px;
width: 100%; width: 100%;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-files-diff { .workspace-leaf-content[data-type="diff-view"] .d2h-files-diff {
width: 100%; width: 100%;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-diff { .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff {
overflow-y: hidden; overflow-y: hidden;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-side-diff { .workspace-leaf-content[data-type="diff-view"] .d2h-file-side-diff {
display: inline-block; display: inline-block;
margin-bottom: -8px; margin-bottom: -8px;
margin-right: -4px; margin-right: -4px;
overflow-x: scroll; overflow-x: scroll;
overflow-y: hidden; overflow-y: hidden;
width: 50%; width: 50%;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line { .workspace-leaf-content[data-type="diff-view"] .d2h-code-line {
padding: 0 8em; padding: 0 8em;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line, .workspace-leaf-content[data-type="diff-view"] .d2h-code-line,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line { .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line {
display: inline-block; display: inline-block;
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
white-space: nowrap; white-space: nowrap;
width: 100%; width: 100%;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line { .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line {
padding: 0 4.5em; padding: 0 4.5em;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line-ctn { .workspace-leaf-content[data-type="diff-view"] .d2h-code-line-ctn {
word-wrap: normal; word-wrap: normal;
background: none; background: none;
display: inline-block; display: inline-block;
padding: 0; padding: 0;
-webkit-user-select: text; -webkit-user-select: text;
-moz-user-select: text; -moz-user-select: text;
-ms-user-select: text; -ms-user-select: text;
user-select: text; user-select: text;
vertical-align: middle; vertical-align: middle;
white-space: pre; white-space: pre;
width: 100%; width: 100%;
} }
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del, .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.theme-light .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del {
.workspace-leaf-content[data-type="diff-view"] background-color: #ffb6ba;
.d2h-code-side-line
del {
background-color: #ffb6ba;
} }
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del, .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.theme-dark .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del {
.workspace-leaf-content[data-type="diff-view"] background-color: #8d232881;
.d2h-code-side-line
del {
background-color: #8d232881;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line del, .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins, .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del, .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins { .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
border-radius: 0.2em; border-radius: 0.2em;
display: inline-block; display: inline-block;
margin-top: -1px; margin-top: -1px;
text-decoration: none; text-decoration: none;
vertical-align: middle; vertical-align: middle;
} }
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins, .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.theme-light .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
.workspace-leaf-content[data-type="diff-view"] background-color: #97f295;
.d2h-code-side-line text-align: left;
ins {
background-color: #97f295;
text-align: left;
} }
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins, .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.theme-dark .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
.workspace-leaf-content[data-type="diff-view"] background-color: #1d921996;
.d2h-code-side-line text-align: left;
ins {
background-color: #1d921996;
text-align: left;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix { .workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix {
word-wrap: normal; word-wrap: normal;
background: none; background: none;
display: inline; display: inline;
padding: 0; padding: 0;
white-space: pre; white-space: pre;
} }
.workspace-leaf-content[data-type="diff-view"] .line-num1 { .workspace-leaf-content[data-type="diff-view"] .line-num1 {
float: left; float: left;
} }
.workspace-leaf-content[data-type="diff-view"] .line-num1, .workspace-leaf-content[data-type="diff-view"] .line-num1,
.workspace-leaf-content[data-type="diff-view"] .line-num2 { .workspace-leaf-content[data-type="diff-view"] .line-num2 {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
padding: 0 0.5em; padding: 0 0.5em;
text-overflow: ellipsis; text-overflow: ellipsis;
width: 3.5em; width: 3.5em;
} }
.workspace-leaf-content[data-type="diff-view"] .line-num2 { .workspace-leaf-content[data-type="diff-view"] .line-num2 {
float: right; float: right;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber { .workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber {
background-color: var(--background-primary); background-color: var(--background-primary);
border: solid var(--background-modifier-border); border: solid var(--background-modifier-border);
border-width: 0 1px; border-width: 0 1px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
color: var(--text-muted); color: var(--text-muted);
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
position: absolute; position: absolute;
text-align: right; text-align: right;
width: 7.5em; width: 7.5em;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber:after { .workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber:after {
content: "\200b"; content: "\200b";
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber { .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber {
background-color: var(--background-primary); background-color: var(--background-primary);
border: solid var(--background-modifier-border); border: solid var(--background-modifier-border);
border-width: 0 1px; border-width: 0 1px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
color: var(--text-muted); color: var(--text-muted);
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
padding: 0 0.5em; padding: 0 0.5em;
position: absolute; position: absolute;
text-align: right; text-align: right;
text-overflow: ellipsis; text-overflow: ellipsis;
width: 4em; width: 4em;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-diff-tbody tr {
position: relative;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber:after { .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber:after {
content: "\200b"; content: "\200b";
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-emptyplaceholder, .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-emptyplaceholder,
.workspace-leaf-content[data-type="diff-view"] .d2h-emptyplaceholder { .workspace-leaf-content[data-type="diff-view"] .d2h-emptyplaceholder {
background-color: var(--background-primary); background-color: var(--background-primary);
border-color: var(--background-modifier-border); border-color: var(--background-modifier-border);
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix, .workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber, .workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber, .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber,
.workspace-leaf-content[data-type="diff-view"] .d2h-emptyplaceholder { .workspace-leaf-content[data-type="diff-view"] .d2h-emptyplaceholder {
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber, .workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber,
.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber { .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber {
direction: rtl; direction: rtl;
} }
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-del { .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-del {
background-color: #fee8e9; background-color: #fee8e9;
border-color: #e9aeae; border-color: #e9aeae;
} }
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-ins { .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-ins {
background-color: #dfd; background-color: #dfd;
border-color: #b4e2b4; border-color: #b4e2b4;
} }
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-del { .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-del {
background-color: #521b1d83; background-color: #521b1d83;
border-color: #691d1d73; border-color: #691d1d73;
} }
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-ins { .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-ins {
background-color: rgba(30, 71, 30, 0.5); background-color: rgba(30, 71, 30, 0.5);
border-color: #13501381; border-color: #13501381;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-info { .workspace-leaf-content[data-type="diff-view"] .d2h-info {
background-color: var(--background-primary); background-color: var(--background-primary);
border-color: var(--background-modifier-border); border-color: var(--background-modifier-border);
color: var(--text-normal); color: var(--text-normal);
} }
.theme-light
.workspace-leaf-content[data-type="diff-view"] .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-del.d2h-change {
.d2h-file-diff background-color: #fdf2d0;
.d2h-del.d2h-change {
background-color: #fdf2d0;
} }
.theme-dark
.workspace-leaf-content[data-type="diff-view"] .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-del.d2h-change {
.d2h-file-diff background-color: #55492480;
.d2h-del.d2h-change {
background-color: #55492480;
} }
.theme-light
.workspace-leaf-content[data-type="diff-view"] .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-ins.d2h-change {
.d2h-file-diff background-color: #ded;
.d2h-ins.d2h-change {
background-color: #ded;
} }
.theme-dark
.workspace-leaf-content[data-type="diff-view"] .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-ins.d2h-change {
.d2h-file-diff background-color: rgba(37, 78, 37, 0.418);
.d2h-ins.d2h-change {
background-color: rgba(37, 78, 37, 0.418);
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper { .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper {
margin-bottom: 10px; margin-bottom: 10px;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper a { .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper a {
color: #3572b0; color: #3572b0;
text-decoration: none; text-decoration: none;
} }
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-list-wrapper .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper a:visited {
a:visited { color: #3572b0;
color: #3572b0;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-header { .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-header {
text-align: left; text-align: left;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-title { .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-title {
font-weight: 700; font-weight: 700;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-line { .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-line {
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
text-align: left; text-align: left;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list { .workspace-leaf-content[data-type="diff-view"] .d2h-file-list {
display: block; display: block;
list-style: none; list-style: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list > li {
border-bottom: 1px solid var(--background-modifier-border); .workspace-leaf-content[data-type="diff-view"] .d2h-file-list>li {
margin: 0; border-bottom: 1px solid var(--background-modifier-border);
padding: 5px 10px; margin: 0;
padding: 5px 10px;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-list > li:last-child {
border-bottom: none; .workspace-leaf-content[data-type="diff-view"] .d2h-file-list>li:last-child {
border-bottom: none;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-file-switch { .workspace-leaf-content[data-type="diff-view"] .d2h-file-switch {
cursor: pointer; cursor: pointer;
display: none; display: none;
font-size: 10px; font-size: 10px;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-icon { .workspace-leaf-content[data-type="diff-view"] .d2h-icon {
fill: currentColor; fill: currentColor;
margin-right: 10px; margin-right: 10px;
vertical-align: middle; vertical-align: middle;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-deleted { .workspace-leaf-content[data-type="diff-view"] .d2h-deleted {
color: #c33; color: #c33;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-added { .workspace-leaf-content[data-type="diff-view"] .d2h-added {
color: #399839; color: #399839;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-changed { .workspace-leaf-content[data-type="diff-view"] .d2h-changed {
color: #d0b44c; color: #d0b44c;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-moved { .workspace-leaf-content[data-type="diff-view"] .d2h-moved {
color: #3572b0; color: #3572b0;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-tag { .workspace-leaf-content[data-type="diff-view"] .d2h-tag {
background-color: var(--background-primary); background-color: var(--background-primary);
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
font-size: 10px; font-size: 10px;
margin-left: 5px; margin-left: 5px;
padding: 0 2px; padding: 0 2px;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-deleted-tag { .workspace-leaf-content[data-type="diff-view"] .d2h-deleted-tag {
border: 2px solid #c33; border: 2px solid #c33;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-added-tag { .workspace-leaf-content[data-type="diff-view"] .d2h-added-tag {
border: 1px solid #399839; border: 1px solid #399839;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-changed-tag { .workspace-leaf-content[data-type="diff-view"] .d2h-changed-tag {
border: 1px solid #d0b44c; border: 1px solid #d0b44c;
} }
.workspace-leaf-content[data-type="diff-view"] .d2h-moved-tag { .workspace-leaf-content[data-type="diff-view"] .d2h-moved-tag {
border: 1px solid #3572b0; border: 1px solid #3572b0;
} }

5
.obsidian/plugins/obsidian-version-history-diff/data.json vendored Normal file
View File

@@ -0,0 +1,5 @@
{
"diffStyle": "word",
"matchWordsThreshold": 0.25,
"colorBlind": true
}

452
.obsidian/plugins/obsidian-version-history-diff/main.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

10
.obsidian/plugins/obsidian-version-history-diff/manifest.json vendored Normal file
View File

@@ -0,0 +1,10 @@
{
"id": "obsidian-version-history-diff",
"name": "Version History Diff",
"version": "2.1.0",
"minAppVersion": "1.1.7",
"description": "Diff the version history of the core Sync and File Recovery plugins and Git. Adds a command to open the core Sync version history as well.",
"author": "kometenstaub",
"authorUrl": "https://github.com/kometenstaub",
"isDesktopOnly": false
}

27
.obsidian/plugins/obsidian-version-history-diff/styles.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

111
.obsidian/workspace vendored
View File

@@ -1,111 +0,0 @@
{
"main": {
"id": "c01acc1e0c3642a1",
"type": "split",
"children": [
{
"id": "458b5417a938cfb3",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "SerializedObject.md",
"mode": "source",
"source": false
}
}
}
],
"direction": "vertical"
},
"left": {
"id": "b3f2fe956c600b2b",
"type": "split",
"children": [
{
"id": "b892947aee3a10a9",
"type": "tabs",
"children": [
{
"id": "b736346aa28b495c",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {}
}
},
{
"id": "bd33cd6e5600118d",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
}
}
}
]
}
],
"direction": "horizontal",
"width": 249
},
"right": {
"id": "d809b577c235ae94",
"type": "split",
"children": [
{
"id": "7cbbb049622f8875",
"type": "tabs",
"children": [
{
"id": "fc04db1c3d5f37f2",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"file": "SerializedObject.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
}
}
},
{
"id": "d9c52b59dc19017c",
"type": "leaf",
"state": {
"type": "calendar",
"state": {}
}
}
]
}
],
"direction": "horizontal",
"width": 300,
"collapsed": true
},
"active": "b736346aa28b495c",
"lastOpenFiles": [
"SearchFilter UnityEditor筛选器.md",
"Pasted image 20221021171104.png",
"Mesh Baker.md",
"conflict-files-obsidian-git.md",
"图集处理.md",
"待办事项/TODO.md",
"本地化流程.md",
"待办事项/Work.md",
"待办事项/Learn.md",
"未命名.md"
]
}

117
.obsidian/workspace.json vendored
View File

@@ -7,27 +7,14 @@
"id": "be09fd8b647f425d", "id": "be09fd8b647f425d",
"type": "tabs", "type": "tabs",
"children": [ "children": [
{
"id": "81fe1e09c99e234a",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "并行计算/CPU/Brust.md",
"mode": "source",
"source": false
}
}
},
{ {
"id": "6aedfe92a5b29e2f", "id": "6aedfe92a5b29e2f",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "diff-view",
"state": { "state": {
"file": "并行计算/GPU/Compute Shader.md", "file": "conflict-files-obsidian-git.md",
"mode": "source", "staged": false
"source": false
} }
} }
}, },
@@ -54,21 +41,8 @@
"source": false "source": false
} }
} }
},
{
"id": "e87e6d863c89589f",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "手写渲染器/课程.md",
"mode": "source",
"source": false
}
}
} }
], ]
"currentTab": 4
} }
], ],
"direction": "vertical" "direction": "vertical"
@@ -97,7 +71,7 @@
"state": { "state": {
"type": "search", "type": "search",
"state": { "state": {
"query": "", "query": "workspace",
"matchingCase": false, "matchingCase": false,
"explainSearch": false, "explainSearch": false,
"collapseAll": false, "collapseAll": false,
@@ -105,6 +79,14 @@
"sortOrder": "alphabetical" "sortOrder": "alphabetical"
} }
} }
},
{
"id": "8f2786b27c7d1630",
"type": "leaf",
"state": {
"type": "starred",
"state": {}
}
} }
] ]
} }
@@ -126,7 +108,6 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "手写渲染器/课程.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@@ -144,34 +125,81 @@
"type": "calendar", "type": "calendar",
"state": {} "state": {}
} }
},
{
"id": "9132b294d54e83ca",
"type": "leaf",
"state": {
"type": "outgoing-link",
"state": {
"linksCollapsed": false,
"unlinkedCollapsed": true
}
}
},
{
"id": "a94ba3bbe0f00555",
"type": "leaf",
"state": {
"type": "tag",
"state": {
"sortOrder": "frequency",
"useHierarchy": true
}
}
},
{
"id": "e28ebb851b5264ee",
"type": "leaf",
"state": {
"type": "outline",
"state": {}
}
},
{
"id": "e0e6db501790a40e",
"type": "leaf",
"state": {
"type": "git-view",
"state": {}
}
} }
] ],
"currentTab": 5
} }
], ],
"direction": "horizontal", "direction": "horizontal",
"width": 300, "width": 300
"collapsed": true
}, },
"left-ribbon": { "left-ribbon": {
"hiddenItems": { "hiddenItems": {
"daily-notes:打开/创建今天的日记": false,
"templates:插入模板": false,
"canvas:新建白板": false, "canvas:新建白板": false,
"switcher:打开快速切换": false, "switcher:打开快速切换": false,
"graph:查看关系图谱": false, "graph:查看关系图谱": false,
"command-palette:打开命令面板": false, "command-palette:打开命令面板": false
"markdown-importer:打开 Markdown 格式转换器": false
} }
}, },
"active": "e87e6d863c89589f", "active": "e0e6db501790a40e",
"lastOpenFiles": [ "lastOpenFiles": [
"网络同步.md", "FairyGui/工作流.md",
"手写渲染器/课程.md", "FairyGui",
"手写渲染器", "并行计算/GPU/Compute Shader.md",
"未命名.canvas",
"未命名 1.canvas",
"log_learn/shader入门精要.md",
"程序集.md", "程序集.md",
"conflict-files-obsidian-git.md",
"Pasted image 20230413163234.png",
"手写渲染器/课程.md",
"log_learn/SkillConfig.md",
"log_learn",
"网络同步.md",
"手写渲染器",
"GPU/GPU渲染流程.md", "GPU/GPU渲染流程.md",
"并行计算/GPU/SIMT.md", "并行计算/GPU/SIMT.md",
"并行计算/GPU/Compute Shader.md",
"操作系统/多级缓存队列.md", "操作系统/多级缓存队列.md",
"Pasted image 20230413163234.png",
"GPU", "GPU",
"并行计算/CPU/SIMD(单指令多数据).md", "并行计算/CPU/SIMD(单指令多数据).md",
"并行计算/CPU/Brust.md", "并行计算/CPU/Brust.md",
@@ -181,14 +209,11 @@
"并行计算/CPU.canvas", "并行计算/CPU.canvas",
"并行计算/未命名看板.md", "并行计算/未命名看板.md",
"未命名 2.canvas", "未命名 2.canvas",
"未命名 1.canvas",
"未命名.canvas",
"并行计算/未命名看板 1.md", "并行计算/未命名看板 1.md",
"Issue/超出ScrollView的特效渲染层级不对.md", "Issue/超出ScrollView的特效渲染层级不对.md",
"并行计算", "并行计算",
"Issue", "Issue",
"待办事项/TODO.md", "待办事项/TODO.md",
"FairyGui/工作流.md",
"编辑器/图片/Pasted image 20221025121100.png", "编辑器/图片/Pasted image 20221025121100.png",
"编辑器/SerializedObject.md", "编辑器/SerializedObject.md",
"编辑器/SearchFilter UnityEditor筛选器.md", "编辑器/SearchFilter UnityEditor筛选器.md",

2
log_learn/SkillConfig.md Normal file
View File

@@ -0,0 +1,2 @@

17
log_learn/shader入门精要.md Normal file
View File

@@ -0,0 +1,17 @@
1、模型空间到切线空间的推导
精要：如果一个变换中仅存在平移和旋转，那么这个变换的逆矩阵就等于它的转置矩阵M = (M^-1)^T
https://www.jianshu.com/p/4d742fec15ca
2、切线空间的优势
--todo
3、渲染队列
在Background通道渲染背景 、 Geometry里渲染不透明 、 AlphaTest中渲染需要透明测试的，
这三个通道都开启了深度测试和深度写入
建议Transparent中写关闭深度写入，开启了透明混合的shader，该通道还会按从后往前顺序渲染
Overlay渲染后处理
4、pass