diff --git a/src/views/conflicts-resolution/split-view/diff-view.tsx b/src/views/conflicts-resolution/split-view/diff-view.tsx index 27eff02..9018bc0 100644 --- a/src/views/conflicts-resolution/split-view/diff-view.tsx +++ b/src/views/conflicts-resolution/split-view/diff-view.tsx @@ -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; diff --git a/src/views/conflicts-resolution/split-view/editor-pane.tsx b/src/views/conflicts-resolution/split-view/editor-pane.tsx index a6556d2..09854e5 100644 --- a/src/views/conflicts-resolution/split-view/editor-pane.tsx +++ b/src/views/conflicts-resolution/split-view/editor-pane.tsx @@ -50,6 +50,15 @@ const EditorPane: React.FC = (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({