Fix background color for the nbdime's webapps.

jupyter · Oct 16, 2023 · 22688ea · 22688ea
1 parent 83a768f
commit 22688ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/nbdime/src/common/mergeview.ts b/packages/nbdime/src/common/mergeview.ts
@@ -136,7 +136,7 @@ const baseTheme = EditorView.baseTheme({
     border: 'var(--jp-border-width) solid var(--jp-border-color1)',
     fontSize: '90%',
     padding: '0 3px',
-    borderRadius: '4px',
+    borderRadius: '4px'
   },
 });
 
@@ -1483,10 +1483,12 @@ export class MergeView extends Panel {
         leftWidget = left.remoteEditorWidget;
       }
       this.addWidget(leftWidget);
+      leftWidget.addClass('cm-merge-pane');
       leftWidget.addClass('cm-merge-left-editor');
 
       if (showBase) {
         this.addWidget(this._base);
+        this._base.addClass('cm-merge-pane');
         this._base.addClass('cm-central-editor');
       }
 
@@ -1572,6 +1574,7 @@ export class MergeView extends Panel {
           );
         }
       }
+      mergeWidget.addClass('cm-merge-pane');
       mergeWidget.addClass('cm-merge-editor');
       //END MERGE CASE
       panes = 3 + (showBase ? 1 : 0);
@@ -1590,6 +1593,7 @@ export class MergeView extends Panel {
       } else {
         panes = 2;
         this.addWidget(this._base);
+        this._base.addClass('cm-merge-pane');
         this._base.addClass('cm-diff-left-editor');
         right = this._right = new DiffView({
           model: remote,
@@ -1602,6 +1606,7 @@ export class MergeView extends Panel {
           },
         });
         let rightWidget = right.remoteEditorWidget;
+        rightWidget.addClass('cm-merge-pane');
         rightWidget.addClass('cm-diff-right-editor');
         this.addWidget(new Widget({ node: right.buildGap() }));
         this.addWidget(rightWidget);

diff --git a/packages/nbdime/src/styles/common.css b/packages/nbdime/src/styles/common.css
@@ -95,6 +95,7 @@
   white-space: normal;
   vertical-align: top;
   width: 100%;
+  background-color: var(--jp-cell-editor-background);
 }
 
 .nbdime-root .cm-merge-pane-rightmost {