vault backup: 2025-03-07 22:48:03

.obsidian/app.json

@@ -1 +1,9 @@
-{}
+{
+  "newFileLocation": "current",
+  "newLinkFormat": "relative",
+  "attachmentFolderPath": "./assets",
+  "strictLineBreaks": true,
+  "useMarkdownLinks": true,
+  "showLineNumber": false,
+  "trashOption": "local"
+}

.obsidian/appearance.json

@@ -1,3 +1,5 @@
 {
-  "cssTheme": "ITS Theme"
+  "nativeMenus": true,
+  "cssTheme": "ITS Theme",
+  "accentColor": ""
 }

.obsidian/community-plugins.json

@@ -1,8 +1,10 @@
 [
+  "consistent-attachments-and-links",
+  "nuke-orphans",
+  "hidden-folder-obsidian",
+  "update-relative-links",
   "easy-typing-obsidian",
   "file-explorer-note-count",
   "obsidian-git",
-  "hidden-folder-obsidian",
-  "nuke-orphans",
-  "update-relative-links"
+  "better-export-pdf"
 ]

.obsidian/graph.json

@@ -32,10 +32,6 @@
   "repelStrength": 10,
   "linkStrength": 1,
   "linkDistance": 250,
-<<<<<<< HEAD
   "scale": 0.535979599622594,
-=======
-  "scale": 0.7514342322277586,
->>>>>>> origin/main
   "close": true
 }

.obsidian/plugins/better-export-pdf/data.json

@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
   "showTitle": true,
-=======
-  "showTitle": false,
->>>>>>> origin/main
   "maxLevel": "6",
   "displayHeader": true,
   "displayFooter": true,

.obsidian/plugins/better-export-pdf/main.js

@@ -19928,12 +19928,6 @@ function copyAttributes(node, attributes) {
     node.setAttribute(attr.name, attr.value);
   });
 }
-<<<<<<< HEAD
-=======
-function isNumber(str) {
-  return !isNaN(parseFloat(str));
-}
->>>>>>> origin/main
 
 // src/pdf.ts
 async function getDestPosition(pdfDoc) {
@@ -20160,51 +20154,27 @@ function setMetadata(pdfDoc, { title, author, keywords, subject, creator, create
   pdfDoc.setModificationDate(new Date(updated_at != null ? updated_at : /* @__PURE__ */ new Date()));
 }
 async function exportToPDF(outputFile, config, w, { doc, frontMatter }) {
-<<<<<<< HEAD
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-=======
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
->>>>>>> origin/main
   console.log("output pdf:", outputFile);
   let pageSize = config["pageSize"];
   if (config["pageSize"] == "Custom" && config["pageWidth"] && config["pageHeight"]) {
     pageSize = {
-<<<<<<< HEAD
       width: parseFloat((_a = config["pageWidth"]) != null ? _a : "0") / 25.4,
       height: parseFloat((_b = config["pageHeight"]) != null ? _b : "0") / 25.4
     };
   }
-=======
-      width: parseFloat((_a = config["pageWidth"]) != null ? _a : "210") / 25.4,
-      height: parseFloat((_b = config["pageHeight"]) != null ? _b : "297") / 25.4
-    };
-  }
-  let scale2 = (_c = config == null ? void 0 : config["scale"]) != null ? _c : 100;
-  if (scale2 > 200 || scale2 < 10) {
-    scale2 = 100;
-  }
->>>>>>> origin/main
   const printOptions = {
     landscape: config == null ? void 0 : config["landscape"],
     printBackground: config == null ? void 0 : config["printBackground"],
     generateTaggedPDF: config == null ? void 0 : config["generateTaggedPDF"],
     pageSize,
-<<<<<<< HEAD
     scale: config["scale"] / 100,
-=======
-    scale: scale2 / 100,
->>>>>>> origin/main
     margins: {
       marginType: "default"
     },
     displayHeaderFooter: config["displayHeader"] || config["displayFooter"],
-<<<<<<< HEAD
     headerTemplate: config["displayHeader"] ? (_c = frontMatter == null ? void 0 : frontMatter["headerTemplate"]) != null ? _c : config["headerTemplate"] : "<span></span>",
     footerTemplate: config["displayFooter"] ? (_d = frontMatter == null ? void 0 : frontMatter["footerTemplate"]) != null ? _d : config["footerTemplate"] : "<span></span>"
-=======
-    headerTemplate: config["displayHeader"] ? (_d = frontMatter == null ? void 0 : frontMatter["headerTemplate"]) != null ? _d : config["headerTemplate"] : "<span></span>",
-    footerTemplate: config["displayFooter"] ? (_e = frontMatter == null ? void 0 : frontMatter["footerTemplate"]) != null ? _e : config["footerTemplate"] : "<span></span>"
->>>>>>> origin/main
   };
   if (config.marginType == "0") {
     printOptions["margins"] = {
@@ -20229,17 +20199,10 @@ async function exportToPDF(outputFile, config, w, { doc, frontMatter }) {
   } else if (config.marginType == "3") {
     printOptions["margins"] = {
       marginType: "custom",
-<<<<<<< HEAD
       top: parseFloat((_e = config["marginTop"]) != null ? _e : "0") / 25.4,
       bottom: parseFloat((_f = config["marginBottom"]) != null ? _f : "0") / 25.4,
       left: parseFloat((_g = config["marginLeft"]) != null ? _g : "0") / 25.4,
       right: parseFloat((_h = config["marginRight"]) != null ? _h : "0") / 25.4
-=======
-      top: parseFloat((_f = config["marginTop"]) != null ? _f : "0") / 25.4,
-      bottom: parseFloat((_g = config["marginBottom"]) != null ? _g : "0") / 25.4,
-      left: parseFloat((_h = config["marginLeft"]) != null ? _h : "0") / 25.4,
-      right: parseFloat((_i = config["marginRight"]) != null ? _i : "0") / 25.4
->>>>>>> origin/main
     };
   }
   try {
@@ -20248,11 +20211,7 @@ async function exportToPDF(outputFile, config, w, { doc, frontMatter }) {
       headings: getHeadingTree(doc),
       frontMatter,
       displayMetadata: config == null ? void 0 : config.displayMetadata,
-<<<<<<< HEAD
       maxLevel: parseInt((_i = config == null ? void 0 : config.maxLevel) != null ? _i : "6")
-=======
-      maxLevel: parseInt((_j = config == null ? void 0 : config.maxLevel) != null ? _j : "6")
->>>>>>> origin/main
     });
     await fs.writeFile(outputFile, data);
     if (config.open) {
@@ -20349,14 +20308,6 @@ body {
     break-after: auto;
   }
 }
-<<<<<<< HEAD
-=======
-
-img.__canvas__ {
-  width: 100% !important;
-  height: 100% !important;
-}
->>>>>>> origin/main
 `;
 function getPatchStyle() {
   return [CSS_PATCH, ...getPrintStyle()];
@@ -20809,12 +20760,8 @@ ${px2mm(width)}\xD7${px2mm(height)}mm`;
       await this.appendWebviews(el);
       this.togglePrintSize();
     });
-<<<<<<< HEAD
     const contentEl = wrapper.createDiv();
     contentEl.setAttribute("style", "width:320px;margin-left:16px;");
-=======
-    const contentEl = wrapper.createDiv({ attr: { class: "setting-wrapper" } });
->>>>>>> origin/main
     contentEl.addEventListener("keyup", (event) => {
       if (event.key === "Enter") {
         handleExport();
@@ -20822,20 +20769,8 @@ ${px2mm(width)}\xD7${px2mm(height)}mm`;
     });
     this.generateForm(contentEl);
     const handleExport = async () => {
-<<<<<<< HEAD
       this.plugin.settings.prevConfig = this.config;
       await this.plugin.saveSettings();
-=======
-      var _a2, _b2;
-      this.plugin.settings.prevConfig = this.config;
-      await this.plugin.saveSettings();
-      if (this.config["pageSize"] == "Custom") {
-        if (!isNumber((_a2 = this.config["pageWidth"]) != null ? _a2 : "") || !isNumber((_b2 = this.config["pageHeight"]) != null ? _b2 : "")) {
-          alert("When the page size is Custom, the Width/Height cannot be empty.");
-          return;
-        }
-      }
->>>>>>> origin/main
       if (this.multiplePdf) {
         const outputPath = await getOutputPath(title);
         console.log("output:", outputPath);

.obsidian/plugins/better-export-pdf/manifest.json

@@ -1,11 +1,7 @@
 {
   "id": "better-export-pdf",
   "name": "Better Export PDF",
-<<<<<<< HEAD
   "version": "1.10.0",
-=======
-  "version": "1.10.2",
->>>>>>> origin/main
   "minAppVersion": "0.15.0",
   "description": "Export your notes to PDF, support export preview, add bookmarks outline and header/footer.",
   "author": "l1xnan",

.obsidian/plugins/better-export-pdf/styles.css

@@ -50,15 +50,3 @@
   height: 100%;
   width: 100%;
 }
-<<<<<<< HEAD
-=======
-
-#better-export-pdf .setting-wrapper {
-  width: 320px;
-  margin-left: 16px;
-}
-
-#better-export-pdf .setting-wrapper .setting-item[hidden] {
-  display: none;
-}
->>>>>>> origin/main

.obsidian/plugins/consistent-attachments-and-links/manifest.json

@@ -1,13 +1,8 @@
 {
   "id": "consistent-attachments-and-links",
   "name": "Consistent Attachments and Links",
-<<<<<<< HEAD
   "version": "3.24.1",
   "minAppVersion": "1.7.7",
-=======
-  "version": "3.24.13",
-  "minAppVersion": "1.8.7",
->>>>>>> origin/main
   "description": "This plugin ensures the consistency of attachments and links",
   "author": "Dmitry Savosh",
   "authorUrl": "https://github.com/dy-sh/",