feat: Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337)
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
--sn-stylekit-neutral-contrast-color: #ffffff;
|
||||
--sn-stylekit-success-color: #2b9612;
|
||||
--sn-stylekit-success-contrast-color: #ffffff;
|
||||
--sn-stylekit-warning-color: #f6a200;
|
||||
--sn-stylekit-warning-color: #cc8800;
|
||||
--sn-stylekit-warning-contrast-color: #ffffff;
|
||||
--sn-stylekit-danger-color: #f80324;
|
||||
--sn-stylekit-danger-contrast-color: #ffffff;
|
||||
@@ -27,7 +27,7 @@
|
||||
--sn-stylekit-editor-foreground-color: var(--sn-stylekit-foreground-color);
|
||||
--sn-stylekit-background-color: var(--background-color);
|
||||
--sn-stylekit-foreground-color: var(--foreground-color);
|
||||
--sn-stylekit-border-color: #000000;
|
||||
--sn-stylekit-border-color: #181a1b;
|
||||
--sn-stylekit-contrast-background-color: #000000;
|
||||
--sn-stylekit-contrast-foreground-color: #ffffff;
|
||||
--sn-stylekit-contrast-border-color: #000000;
|
||||
|
||||
Reference in New Issue
Block a user