obsidian-plugin/silvanocerza_github-gitless-sync
1
0
Fork 0
mirror of https://github.com/silvanocerza/github-gitless-sync.git synced 2026-07-22 12:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move diff highlight for split view in editor theme

Browse source
This commit is contained in:
Silvano Cerza 2025-03-09 17:20:18 +01:00
parent 928ad73696
commit 42c15f4479
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/views/conflicts-resolution/split-view/diff-view.tsx
View file

@ -4,21 +4,6 @@ import EditorPane from "./editor-pane";
import ActionsGutter from "./actions-gutter";
import * as React from "react";
// Add styles for diff highlighting
const styles = document.createElement("style");
styles.innerHTML = `
.diff-modify-background {
background-color: rgba(var(--color-yellow-rgb), 0.1);
}
.diff-add-background {
background-color: rgba(var(--color-green-rgb), 0.1);
}
.diff-remove-background {
background-color: rgba(var(--color-red-rgb), 0.1);
}
`;
document.head.appendChild(styles);
interface DiffViewProps {
remoteText: string;
localText: string;

9
src/views/conflicts-resolution/split-view/editor-pane.tsx
View file

@ -50,6 +50,15 @@ const EditorPane: React.FC<EditorPaneProps> = (props) => {
"&.cm-focused .cm-cursor": {
borderLeftColor: "var(--text-normal)",
},
".diff-modify-background": {
backgroundColor: "rgba(var(--color-yellow-rgb), 0.1)",
},
".diff-add-background": {
backgroundColor: "rgba(var(--color-green-rgb), 0.1)",
},
".diff-remove-background": {
backgroundColor: "rgba(var(--color-red-rgb), 0.1)",
},
}),
markdown(),
EditorView.domEventObservers({