From 2d019ecfd4602eda8c7eb9af09c221c010d19b6e Mon Sep 17 00:00:00 2001 From: Andley Chang Date: Mon, 17 Jul 2023 09:07:03 +0800 Subject: [PATCH] vault backup: 2023-07-17 09:07:03 Affected files: .obsidian/plugins/obsidian-hider/data.json .obsidian/snippets/bg4e.css .obsidian/snippets/margin-narrow.css .obsidian/workspace.json BBG4E/HW3-Key.md cheatsheet.md --- .obsidian/plugins/obsidian-hider/data.json | 2 +- .obsidian/snippets/bg4e.css | 88 +++----------------- .obsidian/snippets/margin-narrow.css | 97 +++++++++++++++++++--- .obsidian/workspace.json | 63 ++++---------- BBG4E/HW3-Key.md | 4 +- cheatsheet.md | 7 +- 6 files changed, 118 insertions(+), 143 deletions(-) diff --git a/.obsidian/plugins/obsidian-hider/data.json b/.obsidian/plugins/obsidian-hider/data.json index aa74097..195af87 100644 --- a/.obsidian/plugins/obsidian-hider/data.json +++ b/.obsidian/plugins/obsidian-hider/data.json @@ -1,5 +1,5 @@ { - "hideRibbon": false, + "hideRibbon": true, "hideStatus": false, "hideTabs": true, "hideScroll": false, diff --git a/.obsidian/snippets/bg4e.css b/.obsidian/snippets/bg4e.css index a5e0f52..e50f61c 100644 --- a/.obsidian/snippets/bg4e.css +++ b/.obsidian/snippets/bg4e.css @@ -11,7 +11,6 @@ --color-em:gold; --text-accent:yellow; --control-character-color: white; - --font-text: AndleyFont; } .theme-light { @@ -27,18 +26,11 @@ --color-em:blue; --link-color:rgb(128, 136, 240); --link-external-color:rgb(128, 136, 240); - --font-text: AndleyFont; } -.workspace-ribbon, .workspace-ribbon.mod-left.is-collapsed, .titlebar { - background-color: var(--ribbon-color); - } - .nav-file-title, .nav-folder-title { - font-size: 13px; - line-height: 13px; - padding: 2px 0 0 15px; - white-space: nowrap; + padding: 0 0 0 15px; + font-family: 'Noto Sans', 'Noto Sans TC'; } @@ -57,50 +49,6 @@ ul ul::before { left: -15px; top: 0; bottom: 0; } -/* ============= 設定字型 ================== */ - @font-face { - font-family: AndleyFont; - unicode-range: U+0370-03FF, U+1F00-1FFF; /* Greek UNICODE */ - src: local("Gentium Book Plus"); - } - @font-face { - font-family: AndleyFont; - unicode-range: U+0590-05FF, U+FB10-FB4F; /* Hebrew UNICODE */ - src: local("Ezra SIL"); - } - @font-face { - font-family: AndleyFont; - unicode-range: U+00-024F; /* English UNICODE */ - src: local("Noto Sans"); - } - @font-face { - font-family: AndleyFont; - unicode-range: U+4E00-9FFF; /* Chinese UNICODE */ - src: local("Noto Sans TC"); - } - /* ---- */ - @font-face { - font-family: InterlinearFont; - unicode-range: U+0370-03FF, U+1F00-1FFF; /* Greek UNICODE */ - src: local("Gentium Book Plus"); - } - @font-face { - font-family: InterlinearFont; - unicode-range: U+0590-05FF, U+FB10-FB4F; /* Hebrew UNICODE */ - src: local("SBL Hebrew"); - } - @font-face { - font-family: InterlinearFont; - unicode-range: U+00-024F; /* English UNICODE */ - src: local("Arial Narrow"); - } - @font-face { - font-family: InterlinearFont; - unicode-range: U+4E00-9FFF; /* Chinese UNICODE */ - src: local("Noto Sans TC"); - } - - /* HTML tags in preview and editor */ .cm-s-obsidian span.cm-tag { color: var(--text-tag); @@ -161,26 +109,20 @@ table { /* Ruby Interlinear */ ruby { - display:inline; - font-size: 16px ; /* 12pt 字體大小*/ - font-family: InterlinearFont; - text-align: center; - padding: 1px; + font-family: 'Gentium Book Plus'; + font-size: 16px ; + line-height: 5em; + padding: 0px 2px; +} + +ul ruby { + line-height:2em; } rt { + font-family:'Arial Narrow'; font-size: 13px ; /* 10pt 字體大小*/ - font-family:InterlinearFont; text-align: center; - padding: 1px; -} - -li ruby { - line-height: 3.5 ; -} - -p ruby { - line-height: 6 ; } strong, .cm-strong { @@ -202,11 +144,5 @@ em, .cm-em { body, .markdown-preview-view { - font-family: AndleyFont; + font-family: 'Gentium Book Plus', 'Noto Sans', 'Noto Sans TC'; } - -@media print { - body { - --font-text: InterlinearFont !important; - } -} \ No newline at end of file diff --git a/.obsidian/snippets/margin-narrow.css b/.obsidian/snippets/margin-narrow.css index f371577..682e62d 100644 --- a/.obsidian/snippets/margin-narrow.css +++ b/.obsidian/snippets/margin-narrow.css @@ -1,14 +1,87 @@ -/* ============= 列印 PDF 設定 ============= */ -@page { - size: A4 portrait; - margin-top: 1cm; - margin-left: 0cm; - margin-right:0cm; - margin-bottom: 1cm; + +.theme-dark { + --text-tag: #4f8dc2; + --ribbon-color : rgb(101, 2, 2); + --text-muted: #E6E6E6; + --color1:#ea4335; + --color2:#4285f4; + --color3:#34a853; + --color4:#ff8a00; + --color-strong: greenyellow; + --color-em:gold; + --text-accent:yellow; + --control-character-color: white; + } + +.workspace-ribbon, .workspace-ribbon.mod-left.is-collapsed, .titlebar { + background-color: var(--ribbon-color); + } + +/* HTML tags in preview and editor */ +.cm-s-obsidian span.cm-tag { + color: var(--text-tag); + font-size: 13px; + font-family: "Arial Narrow"; } -.markdown-source-view, .markdown-preview-view, .markdown-preview-view.is-readable-line-width .markdown-preview-sizer { - max-width: 900px; - margin: auto; - } - \ No newline at end of file +/* BULLET POINT RELATIONSHIP LINES */ +.cm-hmd-list-indent .cm-tab, ul ul { + position: relative; + } + +.cm-hmd-list-indent .cm-tab::before, ul ul::before { + content:''; + border-left: 1px dotted grey ; + position: absolute; + } + +ul ul::before { + left: -15px; top: 0; bottom: 0; + } + +/* RUBY Interlinear 格式 */ +ruby { + font-family: 'Gentium Book Plus'; + font-size: 16px ; + line-height: 5em; + padding: 0px 1px; +} + +ul ruby { + line-height:2em; +} + +rt { + font-family: 'Arial Narrow'; + font-size: 13px ; /* 10pt 字體大小*/ + text-align: center; +} + +strong, .cm-strong { + color: var(--color-strong); + font-weight:bolder; +} + +em, .cm-em { + color: var(--color-em); + font-weight:bold; + font-style:italic; +} + + +body, .markdown-preview-view { + + } + + +@media print { + +} + +.cm-header-2,.markdown-preview-view h2 { + color: var(--color2); + font-size:24px; /* 18pt 字體大小*/ + text-align: center; + margin-bottom: 24px; + font-family: "Noto Sans Black", "Noto Sans TC Black"; +} \ No newline at end of file diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 2b46060..e611c5f 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -3,37 +3,6 @@ "id": "3969f3923e6cfedb", "type": "split", "children": [ - { - "id": "af24ae7ee0013b46", - "type": "tabs", - "children": [ - { - "id": "bbdfd5bc74270599", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "BBG4E/HW3.md", - "mode": "source", - "source": true - } - } - }, - { - "id": "d958a4eeae8615af", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "BBG4E/easily confused words.md", - "mode": "preview", - "source": true - } - } - } - ], - "currentTab": 1 - }, { "id": "838a991037af5f85", "type": "tabs", @@ -44,7 +13,7 @@ "state": { "type": "markdown", "state": { - "file": "BBG4E/HW3-Key.md", + "file": "BBG4E/HW4.md", "mode": "preview", "source": true } @@ -104,12 +73,12 @@ "state": {} } } - ], - "currentTab": 1 + ] } ], "direction": "horizontal", - "width": 201.5 + "width": 200, + "collapsed": true }, "right": { "id": "1464b72f66019d33", @@ -125,7 +94,7 @@ "state": { "type": "outline", "state": { - "file": "BBG4E/HW3-Key.md" + "file": "BBG4E/HW4.md" } } }, @@ -146,7 +115,7 @@ "state": { "type": "backlink", "state": { - "file": "BBG4E/HW3-Key.md", + "file": "BBG4E/HW4.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -163,7 +132,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "BBG4E/HW3-Key.md", + "file": "BBG4E/HW4.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -188,10 +157,16 @@ }, "active": "232131c31854f0b6", "lastOpenFiles": [ - "BBG4E/easily confused words.md", - "BBG4E/HW3-Key.md", - "BBG4E/HW2-Key.md", "BBG4E/HW3.md", + "BBG4E/HW4.md", + "BBG4E/HW3-Key.md", + "64-3John/3John-Interlinear.md", + "64-3John/3Jo.1.5–12.md", + "cheatsheet.md", + "64-3John/3Jo.1.13–15.md", + "BBG4E/HW1.md", + "BBG4E/easily confused words.md", + "BBG4E/HW2-Key.md", "40-Matthew/Mat.5.1-12.md", "BBG4E/HW2.md", "BBG4E/HW1-Key.md", @@ -200,10 +175,8 @@ "62-1John/1John-Interlinear.md", "62-1John/1Jo.1.1-4.md", "README.md", - "BBG4E/HW1.md", "BBG4E/BG4E 規劃.canvas", "46-1Corinthians/1Co.11.17-28.md", - "64-3John/3John-Interlinear.md", "46-1Corinthians/1Co.12.3-14.md", "BBG4E/HW12.md", "BBG4E/HW11.md", @@ -211,10 +184,6 @@ "BBG4E/HW6.md", "BBG4E/HW8.md", "BBG4E/HW9.md", - "BBG4E/HW10.md", - "BBG4E/HW5.md", - "BBG4E/HW4.md", - "62-1John/1Jo.1.5-10.md", "62-1John/1Jo.4.7-12.pdf", "images/Pasted image 20230403142914.png", "40-Matthew", diff --git a/BBG4E/HW3-Key.md b/BBG4E/HW3-Key.md index 1faf79e..9f4fb78 100644 --- a/BBG4E/HW3-Key.md +++ b/BBG4E/HW3-Key.md @@ -1,4 +1,4 @@ -## HW❸ (Joh 1:14-18) ## 圖析參考 +## HW❸ (Joh 1:14-18) 圖析參考 - 1:14a ΚαὶκαίAndCONJ (ὁὁtheT-NSM ΛόγοςλόγοςWordN-NSM)S (σὰρξσάρξfleshN-NSF)C (ἐγένετογίνομαιbecameV-ADI-3S)P - 1:14b καὶκαίandCONJ (ἐσκήνωσενσκηνόωdweltV-AAI-3S)P (ἐνἐνamongPREP ἡμῖν,ἐγώusP-1DP)A @@ -19,5 +19,3 @@ - 1:18a (ΘεὸνθεόςGodN-ASM)C (οὐδεὶςοὐδείςno oneA-NSM)S (ἑώρακενὁράωhas seenV-RAI-3S)P (πώποτε·πώποτεever yetADV)A - 1:18b (μονογενὴςμονογενής[the] only begottenA-NSM ΘεὸςθεόςGodN-NSM)S ={ὁὁthe [One]T-NSM [ (ὢνεἰμίbeingV-PAP-NSM)p (εἰςεἰςinPREP τὸνὁtheT-ASM κόλπονκόλποςbosomN-ASM ‹τοῦὁof theT-GSM ΠατρὸςπατήρFatherN-GSM› )a ] }S - 1:18c (ἐκεῖνοςἐκεῖνοςHeD-NSM)S (ἐξηγήσατο.ἐξηγέομαιhas made [Him] knownV-ADI-3S)P -- abcdefghijklmn -- abcdefghijklmn \ No newline at end of file diff --git a/cheatsheet.md b/cheatsheet.md index 4051236..03960fe 100644 --- a/cheatsheet.md +++ b/cheatsheet.md @@ -176,12 +176,11 @@ windows default = 96 DPI Points|Pixels ---|--- 9pt|12px -10pt|13px -10.5pt|14px +10pt|13px 11pt|15px -12pt|16px +12pt|16px 13pt|17px -14pt| +14pt|19px 16pt|22px 18pt|24px 20pt|26px