@@ -10,40 +10,42 @@ function withAlpha(hex: string, alpha: number): string {
1010 return `${ hex } ${ a } ` ;
1111}
1212
13+ // Warm cave-inspired dark theme colors
1314const dark = {
1415 chalky : "#e5c07b" ,
1516 coral : "#e06c75" ,
1617 cyan : "#56b6c2" ,
17- invalid : "#ffffff " ,
18- ivory : "#abb2bf " ,
19- stone : "#7d8799 " ,
18+ invalid : "#f7eddf " ,
19+ ivory : "#c4baa8 " ,
20+ stone : "#8a8275 " ,
2021 malibu : "#61afef" ,
2122 sage : "#98c379" ,
2223 whiskey : "#d19a66" ,
2324 violet : "#c678dd" ,
24- background : "#21252b " ,
25- highlightBackground : "#2c313a " ,
26- tooltipBackground : "#353a42 " ,
27- selection : "#3E4451 " ,
28- cursor : "#528bff " ,
25+ background : "#1a1815 " ,
26+ highlightBackground : "#2a2621 " ,
27+ tooltipBackground : "#322e28 " ,
28+ selection : "#453f37 " ,
29+ cursor : "#f1a82c " ,
2930} ;
3031
32+ // Warm cave-inspired light theme colors
3133const light = {
3234 chalky : "#c18401" ,
33- coral : "#e45649 " ,
35+ coral : "#c45649 " ,
3436 cyan : "#0184bc" ,
35- invalid : "#000000 " ,
36- ivory : "#383a42 " ,
37- stone : "#a0a1a7 " ,
37+ invalid : "#2d2b29 " ,
38+ ivory : "#3d3832 " ,
39+ stone : "#9a9282 " ,
3840 malibu : "#4078f2" ,
3941 sage : "#50a14f" ,
4042 whiskey : "#986801" ,
4143 violet : "#a626a4" ,
42- background : "#fafafa " ,
43- highlightBackground : "#d0d0d0 " ,
44- tooltipBackground : "#f0f0f0 " ,
45- selection : "#d7d7d7 " ,
46- cursor : "#526fff " ,
44+ background : "#f7eddf " ,
45+ highlightBackground : "#ebe1d3 " ,
46+ tooltipBackground : "#f1e5d5 " ,
47+ selection : "#ddd5c7 " ,
48+ cursor : "#dc9300 " ,
4749} ;
4850
4951function createEditorTheme ( colors : typeof dark , isDark : boolean ) {
@@ -290,14 +292,14 @@ export const mergeViewTheme = EditorView.baseTheme({
290292 } ,
291293 } ,
292294 "&light .cm-collapsedLines" : {
293- color : "#444 " ,
295+ color : "#3d3832 " ,
294296 background :
295- "linear-gradient(to bottom, transparent 0, #f3f3f3 30%, #f3f3f3 70%, transparent 100%)" ,
297+ "linear-gradient(to bottom, transparent 0, #ebe1d3 30%, #ebe1d3 70%, transparent 100%)" ,
296298 } ,
297299 "&dark .cm-collapsedLines" : {
298- color : "#ddd " ,
300+ color : "#c4baa8 " ,
299301 background :
300- "linear-gradient(to bottom, transparent 0, #222 30%, #222 70%, transparent 100%)" ,
302+ "linear-gradient(to bottom, transparent 0, #2a2621 30%, #2a2621 70%, transparent 100%)" ,
301303 } ,
302304 ".cm-changeGutter" : { width : "3px" , paddingLeft : "1px" } ,
303305 "&light.cm-merge-a .cm-changedLineGutter, &light .cm-deletedLineGutter" : {
0 commit comments