@@ -136,7 +136,7 @@ const baseTheme = EditorView.baseTheme({
136
136
border : 'var(--jp-border-width) solid var(--jp-border-color1)' ,
137
137
fontSize : '90%' ,
138
138
padding : '0 3px' ,
139
- borderRadius : '4px' ,
139
+ borderRadius : '4px'
140
140
} ,
141
141
} ) ;
142
142
@@ -1483,10 +1483,12 @@ export class MergeView extends Panel {
1483
1483
leftWidget = left . remoteEditorWidget ;
1484
1484
}
1485
1485
this . addWidget ( leftWidget ) ;
1486
+ leftWidget . addClass ( 'cm-merge-pane' ) ;
1486
1487
leftWidget . addClass ( 'cm-merge-left-editor' ) ;
1487
1488
1488
1489
if ( showBase ) {
1489
1490
this . addWidget ( this . _base ) ;
1491
+ this . _base . addClass ( 'cm-merge-pane' ) ;
1490
1492
this . _base . addClass ( 'cm-central-editor' ) ;
1491
1493
}
1492
1494
@@ -1572,6 +1574,7 @@ export class MergeView extends Panel {
1572
1574
) ;
1573
1575
}
1574
1576
}
1577
+ mergeWidget . addClass ( 'cm-merge-pane' ) ;
1575
1578
mergeWidget . addClass ( 'cm-merge-editor' ) ;
1576
1579
//END MERGE CASE
1577
1580
panes = 3 + ( showBase ? 1 : 0 ) ;
@@ -1590,6 +1593,7 @@ export class MergeView extends Panel {
1590
1593
} else {
1591
1594
panes = 2 ;
1592
1595
this . addWidget ( this . _base ) ;
1596
+ this . _base . addClass ( 'cm-merge-pane' ) ;
1593
1597
this . _base . addClass ( 'cm-diff-left-editor' ) ;
1594
1598
right = this . _right = new DiffView ( {
1595
1599
model : remote ,
@@ -1602,6 +1606,7 @@ export class MergeView extends Panel {
1602
1606
} ,
1603
1607
} ) ;
1604
1608
let rightWidget = right . remoteEditorWidget ;
1609
+ rightWidget . addClass ( 'cm-merge-pane' ) ;
1605
1610
rightWidget . addClass ( 'cm-diff-right-editor' ) ;
1606
1611
this . addWidget ( new Widget ( { node : right . buildGap ( ) } ) ) ;
1607
1612
this . addWidget ( rightWidget ) ;
0 commit comments