public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-05-27 01:31:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feat/conflict-diff-jump

Browse Source 
# Conflicts:
#	src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts
This commit is contained in:
SeleiXi
2026-05-23 01:45:21 +08:00
parent 5454e1106f c518223d21
commit 009cc3c87a
84 changed files with 7182 additions and 1971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
styles.css
View File

@@ -17,6 +17,10 @@
min-width: 5em;
}
.conflict-action-button {
margin-right: 4px;
}
.op-scrollable {
overflow-y: scroll;
/* min-height: 280px; */
@@ -525,4 +529,4 @@ div.workspace-leaf-content[data-type=bases] .livesync-status {
outline: 2px solid var(--interactive-accent);
outline-offset: 1px;
border-radius: 2px;
}
}