Skip to content

Commit 2ad3094

Browse files
Fix background color for the nbdime's webapps.
1 parent 83a768f commit 2ad3094

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

packages/nbdime/src/common/mergeview.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const baseTheme = EditorView.baseTheme({
136136
border: 'var(--jp-border-width) solid var(--jp-border-color1)',
137137
fontSize: '90%',
138138
padding: '0 3px',
139-
borderRadius: '4px',
139+
borderRadius: '4px'
140140
},
141141
});
142142

@@ -1483,10 +1483,12 @@ export class MergeView extends Panel {
14831483
leftWidget = left.remoteEditorWidget;
14841484
}
14851485
this.addWidget(leftWidget);
1486+
leftWidget.addClass('cm-merge-pane');
14861487
leftWidget.addClass('cm-merge-left-editor');
14871488

14881489
if (showBase) {
14891490
this.addWidget(this._base);
1491+
this._base.addClass('cm-merge-pane');
14901492
this._base.addClass('cm-central-editor');
14911493
}
14921494

@@ -1572,6 +1574,7 @@ export class MergeView extends Panel {
15721574
);
15731575
}
15741576
}
1577+
mergeWidget.addClass('cm-merge-pane');
15751578
mergeWidget.addClass('cm-merge-editor');
15761579
//END MERGE CASE
15771580
panes = 3 + (showBase ? 1 : 0);
@@ -1590,6 +1593,7 @@ export class MergeView extends Panel {
15901593
} else {
15911594
panes = 2;
15921595
this.addWidget(this._base);
1596+
this._base.addClass('cm-merge-pane');
15931597
this._base.addClass('cm-diff-left-editor');
15941598
right = this._right = new DiffView({
15951599
model: remote,
@@ -1602,6 +1606,7 @@ export class MergeView extends Panel {
16021606
},
16031607
});
16041608
let rightWidget = right.remoteEditorWidget;
1609+
rightWidget.addClass('cm-merge-pane');
16051610
rightWidget.addClass('cm-diff-right-editor');
16061611
this.addWidget(new Widget({ node: right.buildGap() }));
16071612
this.addWidget(rightWidget);

packages/nbdime/src/styles/common.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
/* style as jp-InputArea-editor: */
2727
border: var(--codemirror-border);
2828
border-radius: 0px;
29-
background: var(--jp-cell-editor-background);
3029
}
3130

3231
.nbdime-root .cm-merge-3pane,
@@ -95,6 +94,7 @@
9594
white-space: normal;
9695
vertical-align: top;
9796
width: 100%;
97+
background-color: var(--jp-cell-editor-background);
9898
}
9999

100100
.nbdime-root .cm-merge-pane-rightmost {

0 commit comments

Comments
 (0)