vault backup: 2026-10-07 08:57:02

.obsidian/plugins/editing-toolbar/data.json

@@ -1,5 +1,5 @@
 {
-  "lastVersion": "4.0.11",
+  "lastVersion": "4.1.7",
   "aestheticStyle": "default",
   "positionStyle": "following",
   "menuCommands": [
@@ -455,6 +455,7 @@
   "useCurrentLineForRegex": false,
   "ai": {
     "enabled": false,
+    "showAIContextMenu": true,
     "consentAccepted": false,
     "onboardingShown": true,
     "providerMode": "pkmer-first",

.obsidian/plugins/editing-toolbar/manifest.json

@@ -1,10 +1,10 @@
 {
   "id": "editing-toolbar",
   "name": "Editing Toolbar",
-  "version": "4.0.11",
-  "minAppVersion": "0.14.0",
-  "description": "The Obsidian Editing Toolbar is modified from cmenu, which provides more powerful customization settings and has many built-in editing commands to be a MS Word-like toolbar editing experience.",
+  "version": "4.1.7",
+  "minAppVersion": "1.4.5",
+  "description": "The Editing Toolbar is modified from cmenu, which provides more powerful customization settings and has many built-in editing commands to be a MS Word-like toolbar editing experience.",
   "author": "Cuman",
-  "authorUrl": "https://github.com/cumany/obsidian-editing-toolbar",
+  "authorUrl": "https://github.com/cumany",
   "isDesktopOnly": false
 }

.obsidian/plugins/editing-toolbar/styles.css

@@ -83,7 +83,7 @@ height: var(--toolbar-icon-size) + 8px;
   min-width: 20px;
 }
 
-#editingToolbarModalBar .editingToolbarCommandItem {
+#editingToolbarModalBar .editingToolbarCommandItem.editingToolbarCommandItem {
   margin: 2px;
   border: none;
   display: flex;
@@ -110,7 +110,7 @@ flex-wrap: wrap;
 :is(#editingToolbarModalBar, #editingToolbarPopoverBar) button[class^=editingToolbarCommandsubItem]>.subitem button:hover,
 :is(#editingToolbarModalBar, #editingToolbarPopoverBar) button[class^=editingToolbarCommand]:hover,
 #editingToolbarSecond:hover {
-  background-color: var(--background-modifier-hover) !important;
+  background-color: var(--background-modifier-hover);
 }
 
 /* 下拉菜单按钮样式 */
@@ -199,6 +199,152 @@ editingToolbar SETTING ITEMS
   border-bottom: 1px solid var(--background-modifier-border);
 }
 
+.editing-toolbar-native-command-list {
+  container-type: inline-size;
+}
+
+.editing-toolbar-command-page-navigation {
+  display: none;
+}
+
+.editing-toolbar-native-command-list .setting-item.editingToolbarCommandItem {
+  position: relative;
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(132px, auto);
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+  padding: 8px 12px;
+}
+
+.editingToolbarSettingsTabsContainer.editing-toolbar-native-command-list
+  .editingToolbarCommandItem > .setting-item-info {
+  min-width: 0;
+  flex: none;
+}
+
+.editing-toolbar-native-command-list .editingToolbarCommandItem > .setting-item-info .setting-item-name {
+  overflow-wrap: anywhere;
+}
+
+.editingToolbarSettingsTabsContainer.editing-toolbar-native-command-list
+  .editingToolbarCommandItem > .setting-item-control {
+  display: flex;
+  flex: none;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  gap: 4px;
+  min-width: 0;
+}
+
+.editing-toolbar-native-command-list .setting-item-control > * {
+  margin-inline-start: 0;
+}
+
+.editing-toolbar-native-command-list .setting-item button.editingToolbarSettingsIcon,
+.editing-toolbar-native-command-list .setting-item button.editingToolbarSettingsButton {
+  width: 30px;
+  min-width: 30px;
+  height: 30px;
+  padding: 4px;
+  transform: none;
+  -webkit-transform: none;
+}
+
+.editing-toolbar-native-command-list
+  .editingToolbarCommandItem > .setting-item-control > button {
+  flex: 0 0 30px;
+  width: 30px;
+  min-width: 30px;
+  height: 30px;
+  padding: 4px;
+}
+
+.editing-toolbar-native-command-list .editingToolbarMenuTypeDropdown {
+  max-width: 132px;
+  height: 30px;
+}
+
+.editingToolbarSettingsTabsContainer.editing-toolbar-native-command-list
+  .editingToolbarSettingsTabsContainer_sub {
+  grid-column: 1 / -1;
+  width: calc(100% - 16px);
+  min-width: 0;
+  margin: 6px 0 0 16px;
+  padding: 0 0 0 8px;
+  flex: none;
+}
+
+.editing-toolbar-native-command-list
+  .editingToolbarSettingsTabsContainer_sub
+  .setting-item.editingToolbarCommandItem {
+  width: 100%;
+  margin-left: 0;
+}
+
+.editing-toolbar-native-command-list .editingToolbarCommandItem.is-command-dragging {
+  opacity: 0.45;
+  cursor: grabbing;
+}
+
+.editing-toolbar-native-command-list .editingToolbarCommandItem.is-command-drop-before {
+  box-shadow: inset 0 2px 0 var(--interactive-accent);
+}
+
+.editing-toolbar-native-command-list .editingToolbarCommandItem.is-command-drop-after {
+  box-shadow: inset 0 -2px 0 var(--interactive-accent);
+}
+
+.editing-toolbar-native-command-list
+  .editing-toolbar-command-drop-list.is-command-drop-inside,
+.editing-toolbar-native-command-list .editingToolbarSettingsTabsContainer_sub.is-command-drop-inside {
+  background: rgba(var(--interactive-accent-rgb), 0.08);
+  outline: 1px dashed var(--interactive-accent);
+  outline-offset: -1px;
+}
+
+@container (max-width: 420px) {
+  .editing-toolbar-native-command-list .setting-item.editingToolbarCommandItem {
+    grid-template-columns: minmax(0, 1fr) minmax(168px, 52%);
+  }
+
+  .editing-toolbar-native-command-list
+    .editingToolbarCommandItem > .setting-item-control {
+    grid-column: 2;
+    justify-content: flex-end;
+    align-content: center;
+  }
+
+  .editing-toolbar-native-command-list .editingToolbarMenuTypeDropdown {
+    max-width: 110px;
+  }
+}
+
+.commandSetting-container {
+  margin: 0;
+  padding: 0;
+}
+
+.commandSetting-container > .setting-item {
+  margin: 0;
+  padding: 8px 0;
+}
+
+.commandSetting-container .command-lists-container {
+  margin-top: 8px;
+  padding: 0;
+  border-radius: 0;
+}
+
+.commandSetting-container .command-buttons-container {
+  margin: 4px 0 8px;
+  padding: 8px 10px;
+}
+
+.commandSetting-container .command-buttons-container .setting-item {
+  padding: 4px 0;
+}
+
 /*----------------------------------------------------------------
 editingToolbar CLASS CHANGES
 ----------------------------------------------------------------*/
@@ -313,8 +459,8 @@ editingToolbar SUPPORT
 
 
 div.modal-container.editingToolbar-Modal:not(:is(.changename,.customicon)) .modal-bg {
-  background-color: transparent !important;
-  backdrop-filter: none !important;
+  background-color: transparent;
+  backdrop-filter: none;
   position: relative;
 }
 
@@ -482,10 +628,10 @@ button[class^=editingToolbarCommandsubItem]::after {
   display: none!important;
 }
 .workspace:has(.markdown-source-view.hide-toolbar) > .workspace-split>#editingToolbarModalBar {
-  display: none!important;
+  display: none;
 }
 .workspace:has(.markdown-source-view.hide-toolbar) > .workspace-split>#editingToolbarPopoverBar {
-  display: none!important;
+  display: none;
 }
 :is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-font-color .triangle-icon {
   position: absolute;
@@ -540,14 +686,13 @@ button[class^=editingToolbarCommandsubItem]::after {
 .editingToolbarCommandsubItem-font-color button {
   background-color: transparent;
 }
-
-:is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-ai {
+:is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-ai:not(.editing-toolbar-ai-button-fixed):not(.editing-toolbar-ai-button-inline) {
   position: relative;
   overflow: visible;
   display: inline-flex;
   align-items: center;
   gap: 4px;
-  padding-right: 0px !important;
+  padding-right: 0px;
   isolation: isolate;
 }
 
@@ -556,11 +701,11 @@ button[class^=editingToolbarCommandsubItem]::after {
   max-width: 5.2em;
 }
 
-:is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-ai.editing-toolbar-ai-button-fixed {
+:is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-ai.editing-toolbar-ai-button-fixed.editingToolbarCommandsubItem-ai {
   gap: 2px;
   justify-content: center;
-  padding-left: 4px !important;
-  padding-right: 4px !important;
+  padding-left: 4px;
+  padding-right: 4px;
 }
 
 :is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-ai::before {
@@ -635,11 +780,11 @@ button[class^=editingToolbarCommandsubItem]::after {
 }
 
 @media screen and (max-width: 768px) {
-  :is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-ai.editing-toolbar-ai-button-inline {
+  :is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-ai.editing-toolbar-ai-button-inline.editingToolbarCommandsubItem-ai {
     gap: 2px;
     justify-content: center;
-    padding-left: 4px !important;
-    padding-right: 4px !important;
+    padding-left: 4px;
+    padding-right: 4px;
   }
 
   :is(#editingToolbarModalBar, #editingToolbarPopoverBar) button.editingToolbarCommandsubItem-ai.editing-toolbar-ai-button-inline .editing-toolbar-ai-button-label {
@@ -1291,11 +1436,11 @@ body:has(.workspace-leaf.mod-active .cm-ai-loading, .workspace-leaf.mod-active .
   content: "❗";
 }
 .modal.mod-settings .custom-commands-container .editingToolbarSettingsIcon{
-  box-shadow: none!important;
+  box-shadow: none;
 }
 .modal.mod-settings .custom-commands-container .editingToolbarSettingsIcon:hover{
-  background-color: transparent!important;
-  color: var(--text-normal)!important;
+  background-color: transparent;
+  color: var(--text-normal);
 }
 .modal .setting-item-control>input.id-is-disabled{
   background-color: var(--background-modifier-border);
@@ -1401,21 +1546,21 @@ body:has(.workspace-leaf.mod-active .cm-ai-loading, .workspace-leaf.mod-active .
   width: unset;
   border-collapse: separate;
   border-spacing: 6px;
-  margin: auto !important;
+  margin: auto;
 }
 
 .x-color-picker-wrapper table.x-color-picker-table#x-backgroundcolor-picker-table {
   width: unset;
   border-collapse: separate;
   border-spacing: 6px;
-  margin: auto !important;
+  margin: auto;
 }
 
 .x-color-picker-wrapper .x-color-picker-table th {
   border: 0;
   text-align: left;
   font-weight: normal;
-  background: transparent !important;
+  background: transparent;
   color: #718096;
 }
 
@@ -1458,7 +1603,7 @@ body:has(.workspace-leaf.mod-active .cm-ai-loading, .workspace-leaf.mod-active .
 }
 #editingToolbarModalBar ~.excalidraw .FixedSideContainer_side_top
 {
-  top: 38px!important;
+  top: 38px;
 }
 .excalidraw-wrapper #editingToolbarModalBar.top
 {
@@ -1529,7 +1674,7 @@ transition: none !important;
 
   flex-wrap: wrap;
   display: inline-flex;
-  height: auto !important;
+  height: auto;
   align-items: center;
   overflow: visible;       
   width: fit-content;
@@ -1624,7 +1769,7 @@ transition: none !important;
 
 .editingToolbarSettingsTabsContainer .editingToolbar-Divider-Line .setting-item-control button:last-child {
   padding: 0;
-  background-color: transparent !important;
+  background-color: transparent;
 }
 
 .editingToolbarSettingsTabsContainer .editingToolbar-Divider-Line .setting-item-control button:last-child svg {
@@ -1669,19 +1814,18 @@ transition: none !important;
   display:none;
 }
 .menu.editing-toolbar-dropdown-menu .menu-item.is-disabled {
-  opacity: 0.7 !important;
-  cursor: default !important;
+  opacity: 0.7;
+  cursor: default;
   font-size: 10px;
   font-weight: 400;
   color: var(--text-muted);
   text-transform: uppercase;
   letter-spacing: 0.8px;
   padding: 8px 12px;
-  background-color: transparent !important;
-  display: flex !important;
+  background-color: transparent;
+  display: flex;
   align-items: center;
   gap: 6px;
-    color: var(--text-muted); /* 文字直接变透明背景色 */
     filter: contrast(0.5);
 }
 .theme-dark .menu.editing-toolbar-dropdown-menu .menu-item.is-disabled
@@ -1709,7 +1853,7 @@ transition: none !important;
 }
 
 .menu.editing-toolbar-dropdown-menu .menu-item.is-disabled:hover {
-  background-color: transparent !important;
+  background-color: transparent;
 }
 
 .workspace-tabs.mod-stacked .workspace-tab-header:not(.is-active)+.workspace-leaf #editingToolbarModalBar {
@@ -1796,7 +1940,7 @@ div[data-type=thino_view] .common-editor-wrapper .common-editor-inputer:has(#edi
 
 div[data-type=thino_view] #editingToolbarModalBar.top
 {
-  position:absolute!important;
+  position:absolute;
   width: 100%;
 }
 body.auto-hide-header .workspace-tab-header-container:hover + .workspace-tab-container .workspace-leaf .workspace-leaf-content>.view-header {
@@ -1824,49 +1968,51 @@ body.auto-hide-header .workspace-tab-header-container + .workspace-tab-container
   height: 32px;
 }
 
-@media screen and (max-width: 1024px) {
-  .editing-toolbar-header {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-  }
-}
 /* 头部容器样式 */
 .editing-toolbar-header {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 1em;
-  padding: 0.5em 0;
+  gap: 12px;
+  margin-bottom: 24px;
+  padding: 0 8px;
 }
 
 /* 标题容器样式 */
 .editing-toolbar-title-container {
-  flex-shrink: 0;
+  min-width: 0;
+}
+.editing-toolbar-title-container h1{
+  display:inline;
 }
 
 .editing-toolbar-title {
   margin: 0;
+  overflow-wrap: anywhere;
 }
 
 /* 信息容器样式 */
 .editing-toolbar-info {
   display: flex;
   align-items: center;
-  gap: 1em;
-  flex-wrap: nowrap;
+  flex: 0 0 auto;
 }
 
-/* 修复按钮容器样式 */
+/* 标题栏修复按钮 */
 .editing-toolbar-fix-button {
+  flex: 0 0 32px;
+  width: 32px;
+  min-width: 32px;
+  height: 32px;
   margin: 0;
-  padding: 0;
+  padding: 6px;
   border: 0;
 }
 
-.editing-toolbar-fix-button .setting-item-control {
-  padding: 0;
+@media screen and (max-width: 1024px) {
+  .editing-toolbar-title {
+    font-size: 1.25rem;
+  }
 }
 
 /* 链接样式 */
@@ -1911,14 +2057,6 @@ body.auto-hide-header .workspace-tab-header-container + .workspace-tab-container
   padding: 0 8px;
 }
 
-.editing-toolbar-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 24px;
-  padding: 0 8px;
-}
-
 /* 添加到你的 styles.css 文件中 */
 @keyframes sortable-feedback {
   0% {
@@ -1986,6 +2124,11 @@ body.auto-hide-header .workspace-tab-header-container + .workspace-tab-container
   height: 16px;
   color: rgb(var(--callout-color));
 }
+
+.callout-icon-container svg.custom-admonition-icon {
+  width: var(--icon-size);
+  height: var(--icon-size);
+}
 .insert-link-modal .setting-item
 {
  border-top: none;
@@ -2113,7 +2256,7 @@ body.auto-hide-header .workspace-tab-header-container + .workspace-tab-container
 
 
  .toolbar-preview-container #editingToolbarModalBar{
-  visibility:visible !important;
+  visibility:visible;
   position: relative;
  }
 
@@ -2451,7 +2594,7 @@ body.auto-hide-header .workspace-tab-header-container + .workspace-tab-container
  
 
 .is-phone .mod-root .workspace-leaf-content[data-type="markdown"] .view-content:has(.editingToolbarModalBar){
-  mask-image: none;
+  -webkit-mask-image: none;
 } 
 
  
@@ -2734,3 +2877,22 @@ body.auto-hide-header .workspace-tab-header-container + .workspace-tab-container
 .editing-toolbar-ai-inline-body .setting-item {
   border-top: 1px solid var(--background-modifier-border-hover);
 }
+
+/* 更新提示弹窗（UpdateNoticeModal）：样式集中在 styles.css，不再动态注入 <style> */
+.editing-toolbar-update-modal .changelog-container {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  padding: 10px;
+  border: 1px solid var(--background-modifier-border);
+  border-radius: 5px;
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+.editing-toolbar-update-modal .changelog-content {
+  padding: 0 10px;
+}
+
+.editing-toolbar-update-modal .changelog-content a {
+  text-decoration: underline;
+}

.obsidian/plugins/obsidian-custom-attachment-location/manifest.json

@@ -1,9 +1,9 @@
 {
   "id": "obsidian-custom-attachment-location",
   "name": "Custom Attachment Location",
-  "version": "11.3.0",
-  "minAppVersion": "1.12.7",
-  "description": "Customize attachment location with variables(${noteFileName}, ${date:format}, etc) like typora.",
+  "version": "14.0.2",
+  "minAppVersion": "1.13.7",
+  "description": "Customize attachment location with variables({{noteFileName}}, {{date:format}}, etc) like typora.",
   "author": "mnaoumov (created by RainCat1998)",
   "authorUrl": "https://github.com/mnaoumov/",
   "isDesktopOnly": false,

.obsidian/plugins/obsidian-excalidraw-plugin/data.json

@@ -6,11 +6,18 @@
   "phoneFooterSafeAreaPadding": false,
   "tabletFooterSafeAreaPadding": false,
   "folder": "Excalidraw",
+  "libraryFolderPath": "Excalidraw/Libraries",
+  "libraryFileName": "local-library",
+  "libraryStorageMode": "vault",
+  "libraryMigrationStatus": "not-required",
+  "libraryMigrationSnoozeUntil": 0,
   "cropFolder": "",
   "annotateFolder": "",
   "embedUseExcalidrawFolder": false,
   "templateFilePath": "Excalidraw/Template.excalidraw",
   "scriptFolderPath": "Excalidraw/Scripts",
+  "allowJavaScriptFiles": false,
+  "storeScriptFilesAsJavaScript": false,
   "fontAssetsPath": "Excalidraw/CJK Fonts",
   "loadChineseFonts": false,
   "loadJapaneseFonts": false,
@@ -18,8 +25,6 @@
   "compress": true,
   "decompressForMDView": false,
   "onceOffCompressFlagReset": true,
-  "onceOffGPTVersionReset": true,
-  "autosave": true,
   "autosaveIntervalDesktop": 60000,
   "autosaveIntervalMobile": 30000,
   "drawingFilenamePrefix": "Drawing ",
@@ -57,7 +62,6 @@
   "penModeDoubleTapEraser": true,
   "penModeSingleFingerPanning": true,
   "penModeCrosshairVisible": true,
-  "panWithRightMouseButton": false,
   "renderImageInMarkdownReadingMode": false,
   "renderImageInHoverPreviewForMDNotes": false,
   "renderImageInMarkdownToPDF": false,
@@ -131,9 +135,36 @@
   "mdFontColor": "Black",
   "mdBorderColor": "Black",
   "mdCSS": "",
+  "markdownImageSettings": {
+    "defaults": {
+      "width": 500,
+      "paddingBottom": 10,
+      "fontFamily": "Cascadia",
+      "fontColor": "Black",
+      "border": {
+        "enabled": false,
+        "color": "Black"
+      },
+      "css": "",
+      "transclusion": {
+        "enabled": false,
+        "fontFamily": "Cascadia",
+        "fontColor": "Black",
+        "border": {
+          "enabled": false,
+          "color": "Black"
+        },
+        "css": ""
+      }
+    }
+  },
+  "markdownImageDeletionPreference": "ask",
   "scriptEngineSettings": {},
-  "previousRelease": "2.25.3",
+  "autostartScripts": {},
+  "autostartScriptFailures": {},
+  "previousRelease": "2.28.1",
   "showReleaseNotes": true,
+  "useDeclarativeSettings": true,
   "excalidrawMasteryPromoCollapsed": false,
   "compareManifestToPluginVersion": true,
   "showNewVersionNotification": true,
@@ -757,6 +788,7 @@
     }
   },
   "aiDefaultTextModel": "gpt-5-mini",
+  "aiDefaultMultimodalModel": "gpt-5-mini",
   "aiDefaultImageGenerationModel": "gpt-image-1",
   "aiDefaultMaxOutgoingTokens": 0,
   "aiDefaultMaxResponseTokens": 0,
@@ -1080,5 +1112,8 @@
     "alignment": "center",
     "margin": "normal"
   },
-  "disableContextMenu": false
+  "disableContextMenu": false,
+  "onceOffGPTVersionReset": true,
+  "autosave": true,
+  "panWithRightMouseButton": false
 }

.obsidian/plugins/obsidian-excalidraw-plugin/manifest.json

@@ -1,11 +1,11 @@
 {
   "id": "obsidian-excalidraw-plugin",
   "name": "Excalidraw",
-  "version": "2.25.3",
+  "version": "2.28.1",
   "minAppVersion": "1.8.7",
   "description": "Sketch Your Mind. Edit and view Excalidraw drawings. Enter the world of 4D Visual PKM.",
   "author": "Zsolt Viczian",
-  "authorUrl": "https://excalidraw-obsidian.online",
+  "authorUrl": "https://community.sketch-your-mind.com/em",
   "fundingUrl": "https://ko-fi.com/zsolt",
   "helpUrl": "https://github.com/zsviczian/obsidian-excalidraw-plugin#readme",
   "isDesktopOnly": false

.obsidian/plugins/obsidian-git/manifest.json

@@ -6,5 +6,6 @@
     "description": "Integrate Git version control with automatic backup and other advanced features.",
     "isDesktopOnly": false,
     "fundingUrl": "https://ko-fi.com/vinzent",
-    "version": "2.38.6"
+    "version": "2.41.1",
+    "minAppVersion": "1.13.0"
 }

.obsidian/plugins/obsidian-git/styles.css

@@ -134,6 +134,16 @@
     color: var(--text-accent);
 }
 
+.obsidian-git-merge-help ol {
+    padding-inline-start: var(--size-4-6);
+}
+
+.obsidian-git-merge-help-resolved {
+    padding: var(--size-4-3);
+    border-inline-start: 2px solid var(--color-green);
+    background-color: var(--background-secondary);
+}
+
 /* ====== diff2html ======
 The following styles are adapted from the obsidian-version-history plugin by
 @kometenstaub https://github.com/kometenstaub/obsidian-version-history-diff/blob/main/src/styles.scss
@@ -170,6 +180,49 @@ which itself is adapted from the diff2html library with the following original l
     --git-insert: #399839;
     --git-change: #d0b44c;
     --git-move: #3572b0;
+
+    --git-conflict-ours: var(--color-cyan);
+    --git-conflict-theirs: var(--color-blue);
+    --git-conflict-ours-bg: color-mix(
+        in oklch,
+        var(--git-conflict-ours) 10%,
+        transparent
+    );
+    --git-conflict-theirs-bg: color-mix(
+        in oklch,
+        var(--git-conflict-theirs) 10%,
+        transparent
+    );
+    --git-conflict-ours-header-bg: color-mix(
+        in oklch,
+        var(--git-conflict-ours) 25%,
+        transparent
+    );
+    --git-conflict-theirs-header-bg: color-mix(
+        in oklch,
+        var(--git-conflict-theirs) 25%,
+        transparent
+    );
+    --git-conflict-ours-button-bg: color-mix(
+        in oklab,
+        var(--git-conflict-ours) 25%,
+        var(--interactive-normal)
+    );
+    --git-conflict-theirs-button-bg: color-mix(
+        in oklab,
+        var(--git-conflict-theirs) 25%,
+        var(--interactive-normal)
+    );
+    --git-conflict-base-button-bg: color-mix(
+        in oklab,
+        var(--color-purple) 15%,
+        var(--interactive-normal)
+    );
+    --git-conflict-base-bg: color-mix(
+        in oklch,
+        var(--color-purple) 4%,
+        transparent
+    );
 }
 
 .git-diff {
@@ -703,3 +756,148 @@ div:hover > .git-gutter-marker.git-changedelete {
 .git-changes-status-bar .git-change {
     margin-right: 0.3em;
 }
+
+.cm-line.git-conflict-marker-line {
+    display: flex !important;
+    align-items: center;
+    background-color: var(--background-modifier-hover);
+}
+
+.cm-line.git-conflict-marker-line.HyperMD-quote {
+    /* The closing Git marker (`>>>>>>>`) is parsed by Live Preview as nested
+     * Markdown blockquotes. Obsidian marks these layout rules as important, so
+     * the conflict marker must use important as well to undo that styling. */
+    text-indent: 0 !important;
+    padding-inline-start: 0 !important;
+    border-inline-start: none !important;
+}
+
+.git-conflict-marker {
+    background-color: transparent;
+}
+
+.markdown-source-view.mod-cm6
+    .cm-line.git-conflict-marker-line.git-conflict-marker-ours {
+    background-color: var(--git-conflict-ours-header-bg);
+}
+
+.markdown-source-view.mod-cm6
+    .cm-line.git-conflict-marker-line.git-conflict-marker-theirs {
+    background-color: var(--git-conflict-theirs-header-bg);
+}
+
+.git-conflict-panel {
+    display: flex;
+    align-items: center;
+    gap: var(--size-2-2);
+    padding: var(--size-2-2) var(--size-4-2);
+    background-color: var(--background-secondary);
+    border-bottom: 1px solid var(--background-modifier-border);
+}
+
+.git-conflict-panel-label {
+    color: var(--text-muted);
+    font-size: var(--font-ui-smaller);
+    margin-inline-end: auto;
+}
+
+.is-mobile .git-conflict-panel {
+    flex-direction: column;
+    align-items: stretch;
+}
+
+.is-mobile .git-conflict-panel .git-conflict-actions-group {
+    flex-wrap: wrap;
+}
+
+.is-mobile .git-conflict-panel .nav-action-button {
+    flex: 1 1 auto;
+}
+
+.git-conflict-actions-group {
+    display: inline-flex;
+    gap: 0;
+    overflow: hidden;
+    border: 1px solid var(--background-modifier-border);
+    border-radius: var(--radius-s);
+
+    .nav-action-button {
+        margin: 0;
+        border-radius: 0;
+        font-weight: bold;
+        padding: var(--size-2-3);
+    }
+
+    .nav-action-button + .nav-action-button {
+        border-left: 1px solid var(--background-modifier-border);
+    }
+}
+
+.git-conflict-actions-group .git-conflict-choose-ours {
+    background-color: var(--git-conflict-ours-button-bg);
+    color: var(--text-normal);
+}
+
+.git-conflict-actions-group .git-conflict-choose-theirs {
+    background-color: var(--git-conflict-theirs-button-bg);
+    color: var(--text-normal);
+}
+
+.git-conflict-actions-group .git-conflict-choose-base {
+    background-color: var(--git-conflict-base-button-bg);
+    color: var(--text-normal);
+}
+
+.git-conflict-actions-group .git-conflict-choose-both {
+    background-color: var(--interactive-normal);
+    color: var(--text-normal);
+}
+
+.git-conflict-actions-widget {
+    flex: none;
+    margin-left: var(--size-2-2);
+    border-radius: 0;
+}
+
+.cm-line.git-conflict-ours-line {
+    background-color: var(--git-conflict-ours-bg);
+}
+
+.cm-line.git-conflict-theirs-line {
+    background-color: var(--git-conflict-theirs-bg);
+}
+
+.cm-line.git-conflict-base-line {
+    background-color: var(--git-conflict-base-bg);
+}
+
+.cm-line.git-conflict-marker-line::after {
+    content: "";
+    flex: 1;
+    margin-left: var(--size-2-2);
+}
+
+.cm-line.git-conflict-marker-line .git-conflict-actions-widget {
+    order: 2;
+}
+
+.is-mobile .cm-line.git-conflict-marker-line {
+    flex-wrap: wrap;
+}
+
+.is-mobile .cm-line.git-conflict-marker-line::after {
+    display: none;
+}
+
+.is-mobile .cm-line.git-conflict-marker-line .git-conflict-actions-widget {
+    flex: 0 0 100%;
+    margin: var(--size-2-1) 0 0;
+}
+
+.is-mobile .git-conflict-actions-widget {
+    flex-wrap: wrap;
+}
+
+.is-mobile .git-conflict-actions-widget .nav-action-button {
+    flex: 1 1 auto;
+}

.obsidian/plugins/obsidian-livesync/data.json

@@ -22,7 +22,10 @@
   "syncOnFileOpen": false,
   "encrypt": false,
   "passphrase": "",
+  "idDerivationVersion": 0,
+  "idDerivationKey": "",
   "usePathObfuscation": false,
+  "encryptInternalMetadata": false,
   "doNotDeleteFolder": false,
   "resolveConflictsByNewerFile": true,
   "batchSave": false,
@@ -69,13 +72,14 @@
   "syncAfterMerge": false,
   "configPassphraseStore": "",
   "encryptedPassphrase": "",
-  "encryptedCouchDBConnection": "%$ffwYWnZHvJcaml+ZcBdn3CS3DJarcoy1Igpz9poGUi4bBI45cyDslaJsjJocjM5zsswyVWSPY57yqNqcXtKaMCbgNwEooNUQpU5LxykaBZHbSO1i6CMIT/WeKoMOjy5/0yParl5oR3/I4bga6o4sZgKn8QP2ARE0IdOVU1k1C7y0EcTMN4tAhn9+qWKdVelUDTlX6Qhb1uBDR1qC5MngQ3AIh54XfOn7A5PepzBdnyC9yLIoUDRNxYSCSwcQiIjvRdZJ1THSBOgM39F1DNWKVSKMP4PkIzMVUfhEnI2/I90IUQPayZrL+Qco6G0qtmLNjum9PEil5ZheqqTF9JWbU0lE96pDqi67qhi52BzaPN+tBZ/jjEGy9PGl9+yzW3fDuEawgca6JuwjupCgQ6tjYrFuyX6STMy8F9jX2MLzBtRkgmbhDP4RWNU97EmFIybBHYYyWjBqpc5bFbo8aU2W6hZx/AU/f8X6zbixI9cwwHjSEDN0mZd8/bo+eFLGvCZHIKGIRzirSivJV/iAPbDiT65RCIbI282hd9qcF5YnC6NDU+4l7C4P39Ajewzmk6BxvyFR5i+9ivIGCvjMUdS5MH9SWBG41/YCfKdbCX0y4rw+aNzJxlAGLHjsWua6yA14GLa3s8FBZLmE0WXcY2rhH5P/LvFVhM/6zNlBpffwsZsM793XC56opV/IBoPkaoha",
+  "encryptedIdDerivationKey": "",
+  "encryptedCouchDBConnection": "%$KwZyf1Y/mErPk2J1I/BWvAxS8s4yjGSyfc0zj3kzkWg8fbyToEdGWNPj4ROq/bHilbzGpUyrI1GtQij5dSLnGVxY625ntCRLXwPn4LWNw8QwPOc4ZMiaAXpYtEstsHzsWf0pT+E4xM9Bf/ys8k51H3CfhhOS8irNWw6JOZ56pu075Tq32hDYmyAplUmSXkluNBty3NbZXOC6nJ/VkRb77Zw3XqdN4WJ9lr5yl0bF8eAcvH/l3OJHGu6lgCtO7MiZ7bDI8k+z0+z9aWi/M2bB2kEtBoD0LK6Zrvz0bI9jdVkJnK9+OKjr2ZYE+IvVuXpO9eCa1Sq1Tk57kGi6HvHTjGQ4c76VmmqP2el7q12IXr8lBtczsteVufaWx2hwSFRLkQwTmMp3qgk6HNXgaE5VwWX/QkJoQcgWr84W4lf2fuW5OR2c1xdPEwMUAqpJButrowwzYXIFH1HbvAF7jaTKPwAmOfCKs8OAyfGG3mt2ZFoAX8Qekrfnc1JTKL+wfg==",
   "permitEmptyPassphrase": false,
   "remoteConfigurations": {
     "legacy-couchdb": {
       "id": "legacy-couchdb",
       "name": "CouchDB Remote",
-      "uri": "%$ffwYWnZHvJcaml+ZcBdn3CS3DJarcoy1Igpz9poGUi6cFxW02g4X3WWjga1arvQ1Eq5kqs01FGX0V98AkHs3L1x4o+Nay8kOF6TTHvyWiprV0kyQ8jbit3Q5rIJvucgocu3R67oqQQ4cS+51ofWPrFMhT3nBOMqJ/lc69YS/0D8qEeo6Wjhs//aX6eMDj8KUpCWil3/uABaY4TdoVPht",
+      "uri": "%$KwZyf1Y/mErPk2J1I/BWvAxS8s4yjGSyfc0zj3kzkWj7pTdcNH+jgr0nPC5tDcKSW21g7BQt1lV6Dtguzi47j6KEkgUHA935pz9XxHupaxo7fxP6JoDj+OfbIJPMON4xfvGzg+ssirQA0SC5lJ9uHUbuZSwqjy4DUK6XywoXrl/8++jzjYAX6Y8qDjMQDsPV3rKWW/+E69xaGC8Mzsp7",
       "isEncrypted": true
     }
   },
@@ -96,6 +100,8 @@
   "ignoreFiles": ".gitignore",
   "syncOnEditorSave": false,
   "keepReplicationActiveInBackground": true,
+  "allowSleepDuringSynchronisation": false,
+  "allowSleepDuringSynchronisationOnDesktop": true,
   "pluginSyncExtendedSetting": {},
   "syncMaxSizeInMB": 50,
   "settingSyncFile": "",
@@ -152,6 +158,8 @@
   "P2P_turnServers": "",
   "P2P_turnUsername": "",
   "P2P_turnCredential": "",
+  "P2P_maxWirePayloadBytes": 15360,
+  "P2P_connectionPath": "automatic",
   "P2P_useDiagRTC": false,
   "doctorProcessedVersion": "",
   "bucketCustomHeaders": "",

.obsidian/plugins/obsidian-livesync/manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.25.83",
+    "version": "1.0.35",
     "minAppVersion": "1.7.2",
     "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "author": "vorotamoroz",

.obsidian/plugins/obsidian-livesync/styles.css

@@ -12,13 +12,26 @@
     background-color: var(--text-muted);
 }
 
+.vpk-action-dialog__message {
+    user-select: text;
+    -webkit-user-select: text;
+}
+
 .conflict-dev-name {
     display: inline-block;
     min-width: 5em;
 }
 
+.conflict-action-container {
+    display: flex;
+    flex-direction: column;
+    gap: var(--size-4-2);
+    margin-top: var(--size-4-2);
+}
+
 .conflict-action-button {
-    margin-right: 4px;
+    width: 100%;
+    margin: 0;
 }
 
 .op-scrollable {
@@ -138,8 +151,8 @@ div.sls-setting-menu-btn {
     /* width: 100%; */
 }
 
-.sls-setting-tab:hover~div.sls-setting-menu-btn,
-.sls-setting-label.selected .sls-setting-tab:checked~div.sls-setting-menu-btn {
+.sls-setting-tab:hover ~ div.sls-setting-menu-btn,
+.sls-setting-label.selected .sls-setting-tab:checked ~ div.sls-setting-menu-btn {
     background-color: var(--interactive-accent);
     color: var(--text-on-accent);
 }
@@ -174,9 +187,16 @@ body {
     /* padding: 2px; */
     margin: 1px;
     border-radius: 4px;
-    background-image: linear-gradient(-45deg,
-            var(--sls-col-warn-stripe1) 25%, var(--sls-col-warn-stripe2) 25%, var(--sls-col-warn-stripe2) 50%,
-            var(--sls-col-warn-stripe1) 50%, var(--sls-col-warn-stripe1) 75%, var(--sls-col-warn-stripe2) 75%, var(--sls-col-warn-stripe2));
+    background-image: linear-gradient(
+        -45deg,
+        var(--sls-col-warn-stripe1) 25%,
+        var(--sls-col-warn-stripe2) 25%,
+        var(--sls-col-warn-stripe2) 50%,
+        var(--sls-col-warn-stripe1) 50%,
+        var(--sls-col-warn-stripe1) 75%,
+        var(--sls-col-warn-stripe2) 75%,
+        var(--sls-col-warn-stripe2)
+    );
     background-size: 30px 30px;
     display: flex;
     flex-direction: row;
@@ -196,7 +216,6 @@ body {
     100% {
         background-position: 30px 0;
     }
-
 }
 
 .sls-setting-menu-buttons label {
@@ -280,14 +299,6 @@ body {
     border-radius: 4px;
 }
 
-.isWizard .wizardHidden {
-    display: none;
-}
-
-.sls-setting:not(.isWizard) .wizardOnly {
-    display: none;
-}
-
 .sls-item-dirty::before {
     content: "✏";
 }
@@ -301,33 +312,101 @@ body {
     background-color: rgba(var(--background-modifier-error-rgb), 0.3);
 }
 
-.sls-setting-disabled input[type=text],
-.sls-setting-disabled input[type=number],
-.sls-setting-disabled input[type=password] {
+.sls-setting-disabled input[type="text"],
+.sls-setting-disabled input[type="number"],
+.sls-setting-disabled input[type="password"] {
     filter: brightness(80%);
     color: var(--text-muted);
-
 }
 
 .sls-setting-hidden {
     display: none;
 }
 
-
-
 .sls-setting-obsolete {
     /* background-image: linear-gradient(-45deg,
             var(--sls-col-warn-stripe1) 25%, var(--sls-col-warn-stripe2) 25%, var(--sls-col-warn-stripe2) 50%,
             var(--sls-col-warn-stripe1) 50%, var(--sls-col-warn-stripe1) 75%, var(--sls-col-warn-stripe2) 75%, var(--sls-col-warn-stripe2)); */
-    background-image: linear-gradient(-45deg,
-            transparent 25%, rgba(var(--background-secondary), 0.1) 25%, rgba(var(--background-secondary), 0.1) 50%, transparent 50%, transparent 75%, rgba(var(--background-secondary), 0.1) 75%, rgba(var(--background-secondary), 0.1));
+    background-image: linear-gradient(
+        -45deg,
+        transparent 25%,
+        rgba(var(--background-secondary), 0.1) 25%,
+        rgba(var(--background-secondary), 0.1) 50%,
+        transparent 50%,
+        transparent 75%,
+        rgba(var(--background-secondary), 0.1) 75%,
+        rgba(var(--background-secondary), 0.1)
+    );
     background-size: 60px 60px;
 }
 
-.password-input>.setting-item-control>input {
+.password-input > .setting-item-control > input {
     -webkit-text-security: disc;
 }
 
+.sls-onboarding-invitation-action {
+    display: inline;
+}
+
+/* Touch devices need a larger tap target; on desktop this would just pad the
+   link with blank space and make it look like a misplaced button. */
+body.is-mobile .sls-onboarding-invitation-action {
+    display: inline-flex;
+    min-width: 44px;
+    min-height: 44px;
+    align-items: center;
+    justify-content: center;
+}
+
+.sls-review-harness {
+    box-sizing: border-box;
+    max-width: 100%;
+    overflow-x: clip;
+    padding-bottom: max(1rem, env(safe-area-inset-bottom));
+}
+
+.sls-review-harness .setting-item,
+.sls-review-harness .setting-item-control {
+    flex-wrap: wrap;
+    max-width: 100%;
+}
+
+.sls-review-harness .setting-item-info {
+    min-width: min(16rem, 100%);
+}
+
+.sls-review-harness .setting-item-control {
+    gap: 0.5rem;
+}
+
+.sls-review-harness button {
+    min-height: 44px;
+    max-width: 100%;
+    white-space: normal;
+}
+
+.sls-review-harness__result,
+.sls-review-harness__warning,
+.sls-review-harness__privacy,
+.sls-review-harness__error,
+.sls-review-harness__resumed {
+    max-width: 100%;
+    overflow-wrap: anywhere;
+}
+
+.sls-review-harness__result {
+    margin: 0 0 1rem;
+}
+
+.sls-review-harness__warning,
+.sls-review-harness__error {
+    color: var(--text-error);
+}
+
+.sls-review-harness__resumed {
+    color: var(--text-success);
+}
+
 span.ls-mark-cr::after {
     user-select: none;
     content: "↲";
@@ -378,7 +457,6 @@ span.ls-mark-cr::after {
     }
 }
 
-
 .livesync-status {
     user-select: none;
     pointer-events: none;
@@ -401,18 +479,30 @@ span.ls-mark-cr::after {
     font-size: 80%;
 }
 
-div.workspace-leaf-content[data-type=bases]  .livesync-status {
+.is-mobile.is-ios .livesync-status {
+    box-sizing: border-box;
+    top: calc(var(--header-height) + var(--view-header-height, var(--header-height)) + var(--size-4-2));
+}
+
+div.workspace-leaf-content[data-type="bases"] .livesync-status {
     top: calc(var(--bases-header-height) + var(--header-height));
     padding: 5px;
     padding-right: 18px;
 }
 
-.is-mobile div.workspace-leaf-content[data-type=bases]  .livesync-status {
+.is-mobile div.workspace-leaf-content[data-type="bases"] .livesync-status {
     top: calc(var(--bases-header-height) + var(--view-header-height));
     padding: 6px;
     padding-right: 18px;
 }
 
+.is-mobile.is-ios div.workspace-leaf-content[data-type="bases"] .livesync-status {
+    top: calc(
+        var(--bases-header-height) + var(--header-height) + var(--view-header-height, var(--header-height)) +
+            var(--size-4-2)
+    );
+}
+
 .livesync-status div {
     opacity: 0.6;
     -webkit-filter: grayscale(100%);
@@ -422,7 +512,6 @@ div.workspace-leaf-content[data-type=bases]  .livesync-status {
 .livesync-status .livesync-status-loghistory {
     text-align: left;
     opacity: 0.4;
-
 }
 
 .livesync-status div.livesync-status-messagearea:empty {
@@ -440,7 +529,6 @@ div.workspace-leaf-content[data-type=bases]  .livesync-status {
     margin-left: auto;
 }
 
-
 .menu-setting-poweruser-disabled .sls-setting-poweruser {
     display: none;
 }
@@ -454,12 +542,29 @@ div.workspace-leaf-content[data-type=bases]  .livesync-status {
 }
 
 .sls-setting-panel-title {
-    position: sticky;
     font-size: medium;
-    top: 2.5em;
     background-color: var(--background-secondary-alt);
     border-radius: 10px;
-    padding: 0.5em 1.0em;
+    padding: 0.5em 1em;
+}
+
+body.is-mobile .sls-setting button {
+    max-width: 100%;
+    white-space: normal;
+}
+
+body.is-mobile .sls-setting-with-additional-actions {
+    flex-wrap: wrap;
+}
+
+body.is-mobile .sls-setting-with-additional-actions .setting-item-control {
+    min-width: 0;
+    flex: 1 1 100%;
+    flex-wrap: wrap;
+}
+
+body.is-mobile .sls-setting .sls-setting-additional-action {
+    flex: 1 1 12rem;
 }
 
 .active-pane .sls-setting-panel-title {
@@ -476,6 +581,34 @@ div.workspace-leaf-content[data-type=bases]  .livesync-status {
     font-size: 0.8em;
 }
 
+body.is-mobile .livesync-message-box-container {
+    box-sizing: border-box;
+    padding-top: var(--safe-area-inset-top, env(safe-area-inset-top, 0px));
+    padding-right: var(--safe-area-inset-right, env(safe-area-inset-right, 0px));
+    padding-bottom: var(--safe-area-inset-bottom, env(safe-area-inset-bottom, 0px));
+    padding-left: var(--safe-area-inset-left, env(safe-area-inset-left, 0px));
+}
+
+body.is-mobile .livesync-message-box-container .modal {
+    max-height: 100%;
+}
+
+body.is-mobile .livesync-message-box-container button {
+    height: auto;
+    min-height: var(--input-height);
+    white-space: normal;
+}
+
+body.is-mobile .livesync-compatibility-review-notice {
+    box-sizing: border-box;
+    margin-right: calc(64px + var(--safe-area-inset-right, env(safe-area-inset-right, 0px)));
+    min-width: 0;
+    width: calc(
+        100vw - 88px - var(--safe-area-inset-left, env(safe-area-inset-left, 0px)) -
+            var(--safe-area-inset-right, env(safe-area-inset-right, 0px))
+    );
+}
+
 .sls-qr {
     display: flex;
     justify-content: center;
@@ -488,7 +621,98 @@ div.workspace-leaf-content[data-type=bases]  .livesync-status {
     overflow-x: auto;
     white-space: pre-wrap;
     word-break: break-all;
+}
+
+.sls-repair-results {
+    display: grid;
+    gap: var(--size-4-3);
+}
+
+.sls-repair-result {
+    padding: var(--size-4-3);
+    border: 1px solid var(--background-modifier-border);
+    border-radius: var(--radius-m);
+    background: var(--background-secondary);
+}
+
+.sls-repair-header {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: var(--size-4-2);
+    min-width: 0;
+}
+
+.sls-repair-header > :first-child {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.sls-repair-header h6 {
+    margin: 0;
+    overflow-wrap: anywhere;
+}
+
+.sls-repair-status {
+    display: flex;
+    flex-wrap: wrap;
+    gap: var(--size-4-2);
+    margin-top: var(--size-4-1);
+    font-size: var(--font-ui-smaller);
+}
+
+.sls-repair-status-ok {
+    color: var(--text-success);
+}
+
+.sls-repair-status-warning {
+    color: var(--text-warning);
+}
+
+.sls-repair-metric {
+    margin-top: var(--size-4-1);
+    font-size: var(--font-ui-smaller);
+    line-height: var(--line-height-tight);
+    overflow-wrap: anywhere;
+}
+
+.sls-repair-action-menu {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: var(--clickable-icon-size);
+    width: var(--clickable-icon-size);
+    height: var(--clickable-icon-size);
+    padding: 0;
+}
+
+.sls-repair-action-menu .svg-icon {
+    width: 18px;
+    height: 18px;
+}
+
+.sls-repair-revision {
+    margin-top: var(--size-4-2);
+    padding: var(--size-4-2);
+    border-left: 3px solid var(--background-modifier-border);
+    background: var(--background-primary-alt);
+}
+
+.sls-repair-revision-title {
+    font-weight: var(--font-semibold);
+    overflow-wrap: anywhere;
+}
+
+.sls-repair-revision code {
+    display: block;
+    margin-top: var(--size-4-1);
+    overflow-wrap: anywhere;
+    white-space: normal;
+}
 
+.sls-repair-ancestor-warning {
+    margin-top: var(--size-4-2);
+    color: var(--text-warning);
 }
 
 /* Diff navigation */
@@ -551,6 +775,51 @@ div.workspace-leaf-content[data-type=bases]  .livesync-status {
     color: var(--text-muted);
 }
 
+.history-search-row button:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+}
+
+.history-rev-nav-row {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    margin-bottom: 8px;
+}
+
+.history-rev-nav-row input[type="range"] {
+    flex-grow: 1;
+    margin-bottom: 0;
+}
+
+.history-rev-nav-btn {
+    flex-shrink: 0;
+    padding: 2px 10px;
+    font-size: 0.9em;
+    cursor: pointer;
+    border: 1px solid var(--background-modifier-border);
+    border-radius: 4px;
+    background-color: var(--background-secondary);
+    color: var(--text-normal);
+}
+
+.history-rev-nav-btn:hover:not(:disabled) {
+    background-color: var(--background-modifier-hover);
+}
+
+.history-rev-nav-btn:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+}
+
+.history-rev-indicator {
+    flex-shrink: 0;
+    font-size: 0.85em;
+    color: var(--text-muted);
+    min-width: 4.5em;
+    text-align: right;
+}
+
 .history-diff-options-row {
     justify-content: space-between;
 }
@@ -570,4 +839,3 @@ div.workspace-leaf-content[data-type=bases]  .livesync-status {
     outline-offset: 1px;
     border-radius: 2px;
 }
-

.obsidian/plugins/obsidian-memos/manifest.json

@@ -1,10 +1,10 @@
 {
   "id": "obsidian-memos",
   "name": "Thino",
-  "description": "Capturing ideas and save them into daily notes. (Closed source)",
-  "version": "3.0.16",
+  "description": "Capturing ideas and save them into daily notes (Closed source).",
+  "version": "3.2.2",
   "author": "Boninall",
   "authorUrl": "https://github.com/Quorafind/",
   "isDesktopOnly": false,
-  "minAppVersion": "1.0.0"
+  "minAppVersion": "1.12.2"
 }

.obsidian/plugins/omnisearch/data.json

@@ -14,7 +14,6 @@
   "aiImageIndexing": false,
   "unsupportedFilesIndexing": "default",
   "splitCamelCase": false,
-  "openInNewPane": false,
   "vimLikeNavigationShortcut": false,
   "ribbonIcon": true,
   "showExcerpt": true,
@@ -39,5 +38,6 @@
   "welcomeMessage": "1.21.0",
   "verboseLogging": false,
   "DANGER_httpHost": null,
-  "DANGER_forceSaveCache": false
+  "DANGER_forceSaveCache": false,
+  "openInNewPane": false
 }

.obsidian/plugins/omnisearch/manifest.json

@@ -1,8 +1,8 @@
 {
   "id": "omnisearch",
   "name": "Omnisearch",
-  "version": "1.29.3",
-  "minAppVersion": "1.7.2",
+  "version": "1.31.0",
+  "minAppVersion": "1.13.3",
   "description": "A search engine that just works.",
   "author": "Simon Cambier",
   "authorUrl": "https://scambier.xyz",

.obsidian/plugins/omnisearch/styles.css

@@ -138,13 +138,13 @@
   background-color: var(
     --omnisearch-highlight-color,
     rgba(222, 183, 110, 1)
-  ) !important;
-  color: var(--omnisearch-highlight-text-color, black) !important;
+  );
+  color: var(--omnisearch-highlight-text-color, black);
 }
 
 .omnisearch-result-highlight .cm-selectionLayer .cm-selectionBackground {
   background-color: var(
     --omnisearch-highlight-color,
     rgba(222, 183, 110, 1)
-  ) !important;
+  );
 }

.obsidian/plugins/quickadd/data.json

@@ -3,13 +3,17 @@
   "inputPrompt": "single-line",
   "persistInputPromptDrafts": true,
   "useSelectionAsCaptureValue": true,
+  "namePastedImagesAfterNoteTitle": false,
+  "searchNestedChoices": true,
+  "templateFolderLauncherRow": "bottom",
   "devMode": false,
-  "templateFolderPath": "",
+  "templateFolderPaths": [],
   "announceUpdates": "major",
-  "version": "2.12.3",
+  "version": "2.31.0",
   "globalVariables": {},
   "onePageInputEnabled": false,
   "disableOnlineFeatures": true,
+  "enableUriCallbacks": false,
   "enableRibbonIcon": false,
   "showCaptureNotification": true,
   "showInputCancellationNotification": false,
@@ -25,6 +29,7 @@
     "lm": "last month",
     "ly": "last year"
   },
+  "showDateCalendar": true,
   "ai": {
     "defaultModel": "Ask me",
     "defaultSystemPrompt": "As an AI assistant within Obsidian, your primary goal is to help users manage their ideas and knowledge more effectively. Format your responses using Markdown syntax. Please use the [[Obsidian]] link format. You can write aliases for the links by writing [[Obsidian|the alias after the pipe symbol]]. To use mathematical notation, use LaTeX syntax. LaTeX syntax for larger equations should be on separate lines, surrounded with double dollar signs ($$). You can also inline math expressions by wrapping it in $ symbols. For example, use $$w_{ij}^{\\text{new}}:=w_{ij}^{\\text{current}}+\\eta\\cdot\\delta_j\\cdot x_{ij}$$ on a separate line, but you can write \"($\\eta$ = learning rate, $\\delta_j$ = error term, $x_{ij}$ = input)\" inline.",
@@ -52,29 +57,110 @@
             "name": "gpt-4",
             "maxTokens": 8192
           },
-          {
-            "name": "gpt-4-32k",
-            "maxTokens": 32768
-          },
-          {
-            "name": "gpt-4-1106-preview",
-            "maxTokens": 128000
-          },
           {
             "name": "gpt-4-turbo",
             "maxTokens": 128000
           },
           {
             "name": "gpt-4o",
-            "maxTokens": 128000
+            "maxTokens": 128000,
+            "maxOutputTokens": 16384,
+            "supportsTemperature": true
           },
           {
             "name": "gpt-4o-mini",
-            "maxTokens": 128000
+            "maxTokens": 128000,
+            "maxOutputTokens": 16384,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gpt-6-sol",
+            "maxTokens": 1050000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": false
+          },
+          {
+            "name": "gpt-6-luna",
+            "maxTokens": 1050000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": false
+          },
+          {
+            "name": "gpt-6-astra",
+            "maxTokens": 1050000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": false
+          },
+          {
+            "name": "gpt-5.6-sol",
+            "maxTokens": 1050000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": false
+          },
+          {
+            "name": "gpt-5.6-luna",
+            "maxTokens": 1050000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": false
+          },
+          {
+            "name": "gpt-5.6-terra",
+            "maxTokens": 1050000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": false
+          },
+          {
+            "name": "gpt-5.5",
+            "maxTokens": 1050000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": false
+          },
+          {
+            "name": "gpt-5.4",
+            "maxTokens": 1050000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gpt-5.4-mini",
+            "maxTokens": 400000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gpt-5.4-nano",
+            "maxTokens": 400000,
+            "maxOutputTokens": 128000,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gpt-4.1",
+            "maxTokens": 1047576,
+            "maxOutputTokens": 32768,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gpt-4.1-mini",
+            "maxTokens": 1047576,
+            "maxOutputTokens": 32768,
+            "supportsTemperature": true
+          },
+          {
+            "name": "o3",
+            "maxTokens": 200000,
+            "maxOutputTokens": 100000,
+            "supportsTemperature": false
+          },
+          {
+            "name": "o4-mini",
+            "maxTokens": 200000,
+            "maxOutputTokens": 100000,
+            "supportsTemperature": false
           }
         ],
-        "autoSyncModels": false,
-        "modelSource": "modelsDev"
+        "autoSyncModels": true,
+        "modelSource": "modelsDev",
+        "id": "openai"
       },
       {
         "name": "Gemini",
@@ -82,20 +168,75 @@
         "apiKey": "",
         "models": [
           {
-            "name": "gemini-1.5-pro",
-            "maxTokens": 1000000
+            "name": "gemini-3.8-flash",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gemini-3.7-flash",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gemini-3.6-flash",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gemini-3.5-flash",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gemini-3.5-flash-lite",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gemini-3.1-pro-preview",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gemini-3.1-flash-lite",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gemini-3-flash-preview",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
+          },
+          {
+            "name": "gemini-2.5-pro",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
           },
           {
-            "name": "gemini-1.5-flash",
-            "maxTokens": 1000000
+            "name": "gemini-2.5-flash",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
           },
           {
-            "name": "gemini-1.5-flash-8b",
-            "maxTokens": 1000000
+            "name": "gemini-2.5-flash-lite",
+            "maxTokens": 1048576,
+            "maxOutputTokens": 65536,
+            "supportsTemperature": true
           }
         ],
-        "autoSyncModels": false,
-        "modelSource": "modelsDev"
+        "autoSyncModels": true,
+        "modelSource": "modelsDev",
+        "id": "gemini"
       }
     ]
   },
@@ -112,6 +253,9 @@
     "migrateFileOpeningSettings": true,
     "backfillFileOpeningDefaults": true,
     "setProviderModelDiscoveryMode": true,
-    "migrateProviderApiKeysToSecretStorage": true
+    "migrateProviderApiKeysToSecretStorage": true,
+    "migrateToMultipleTemplateFolders": true,
+    "refreshStaleDefaultModelSeeds": true,
+    "pinAiModelRefs": true
   }
 }

.obsidian/plugins/quickadd/manifest.json

@@ -1,12 +1,12 @@
 {
 	"id": "quickadd",
 	"name": "QuickAdd",
-	"version": "2.12.3",
-	"minAppVersion": "1.11.4",
+	"version": "2.31.0",
+	"minAppVersion": "1.13.0",
 	"description": "Quickly add new pages or content to your vault.",
 	"author": "Christian B. B. Houmann",
 	"authorUrl": "https://bagerbach.com",
 	"fundingUrl": "https://www.buymeacoffee.com/chhoumann",
 	"helpUrl": "https://quickadd.obsidian.guide/docs/",
 	"isDesktopOnly": false
-}
+}