24
24
overflow : hidden;
25
25
}
26
26
27
+ .jp-git-diff-root .cm-editor {
28
+ height : 100% ;
29
+ }
30
+
27
31
button .jp-git-diff-refresh {
28
32
border : solid 1px var (--jp-warn-color2 );
29
33
}
@@ -44,35 +48,58 @@ button.jp-git-diff-resolve .jp-ToolbarButtonComponent-label {
44
48
.jp-git-merge-banner {
45
49
flex : 0 0 auto;
46
50
margin : 2px 0 ;
47
- display : flex;
51
+ display : grid;
52
+ grid-auto-rows : minmax (18px , auto);
53
+ width : 100% ;
54
+ }
55
+
56
+ .jp-git-diff-banner {
57
+ grid-template-columns : 47% 6% 47% ;
48
58
}
49
59
50
60
.jp-git-diff-banner span {
51
61
padding : 0 4px ;
52
- width : 47% ;
53
62
font-weight : bold;
63
+
64
+ overflow : hidden;
65
+ text-overflow : ellipsis;
54
66
}
55
67
56
- .jp-git-diff-banner span . jp-spacer {
57
- width : 6 % ;
68
+ .jp-git-diff-banner span : first-child {
69
+ grid-column : 1 ;
58
70
}
59
71
60
- .jp-git-merge-banner span {
61
- padding : 0 4px ;
62
- width : 31% ;
63
- font-weight : bold;
72
+ .jp-git-diff-banner span : last-child {
73
+ grid-column : 3 ;
64
74
}
65
75
66
76
.jp-git-diff-banner span : first-of-type {
67
- background-color : var (--jp-git-diff-deleted-color );
77
+ background-color : var (--jp-git-diff-deleted-color1 );
68
78
}
69
79
70
80
.jp-git-diff-banner span : last-of-type {
71
- background-color : var (--jp-git-diff-added-color );
81
+ background-color : var (--jp-git-diff-added-color1 );
72
82
}
73
83
74
- .jp-git-merge-banner span .jp-spacer {
75
- width : 3.5% ;
84
+ .jp-git-merge-banner {
85
+ grid-template-columns : repeat (3 , 1fr );
86
+ gap : 10px ;
87
+ }
88
+
89
+ .jp-git-merge-banner span {
90
+ padding : 0 4px ;
91
+ font-weight : bold;
92
+
93
+ overflow : hidden;
94
+ text-overflow : ellipsis;
95
+ }
96
+
97
+ .jp-git-merge-banner span : first-of-type {
98
+ background-color : var (--jp-merge-local-color1 );
99
+ }
100
+
101
+ .jp-git-merge-banner span : last-of-type {
102
+ background-color : var (--jp-git-diff-added-color1 );
76
103
}
77
104
78
105
.jp-git-diff-root .cm-merge {
@@ -106,71 +133,35 @@ button.jp-git-diff-resolve .jp-ToolbarButtonComponent-label {
106
133
vertical-align : top;
107
134
}
108
135
109
- .jp-git-diff-root .cm-merge-1pane .cm-merge-gap {
110
- width : 6% ;
111
- }
112
-
113
- .jp-git-diff-root .cm-merge-2pane .cm-merge-pane {
114
- width : 47% ;
115
- }
116
-
117
- .jp-git-diff-root .cm-merge-2pane .cm-merge-gap {
118
- width : 6% ;
119
- }
120
-
121
- .jp-git-diff-root .cm-merge-3pane .cm-merge-pane {
122
- width : 31% ;
123
- }
124
-
125
- .jp-git-diff-root .cm-merge-3pane .cm-merge-gap {
126
- width : 3.5% ;
127
- }
128
-
129
136
.jp-git-diff-root .cm-merge-pane-rightmost {
130
137
position : absolute;
131
138
right : 0 ;
132
139
z-index : 1 ;
133
140
}
134
141
135
- .jp-git-diff-root .cm-merge-scrolllock-wrap {
136
- position : absolute;
137
- bottom : 0 ;
138
- left : 50% ;
139
- }
140
-
141
- .jp-git-diff-root .cm-merge-scrolllock {
142
- position : relative;
143
- left : -50% ;
144
- cursor : pointer;
145
- line-height : 1 ;
146
- }
147
-
148
- .jp-git-diff-root .cm-merge-r-inserted ,
149
- .jp-git-diff-root .cm-merge-l-inserted {
150
- background-color : var (--jp-git-diff-added-color );
142
+ .jp-Notebook-merge .jp-Merge-conflict {
143
+ background-color : var (--jp-merge-both-color2 );
151
144
}
152
145
153
146
.jp-git-diff-root .cm-merge-r-deleted ,
154
- .jp-git-diff-root .cm-merge-l-deleted {
147
+ .jp-git-diff-root .cm-merge-l-deleted ,
148
+ .jp-git-diff-root .cm-diff-left-editor .cm-merge-r-chunk {
155
149
background-color : var (--jp-git-diff-deleted-color );
156
150
}
157
151
158
- .jp-git-diff-root .cm-merge-collapsed-widget :: before {
159
- content : '(...)' ;
152
+ .jp-git-diff-root .cm-merge-left-editor . cm-merge-l-chunk : not (. jp-Merge-conflict ) {
153
+ background-color : var ( --jp-merge-local-color ) ;
160
154
}
161
155
162
- .jp-git-diff-root .cm-merge-collapsed-widget {
163
- cursor : pointer;
164
- color : var (--jp-ui-font-color1 );
165
- background : var (--jp-layout-color2 );
166
- border : 1px solid var (--jp-border-color1 );
167
- font-size : 90% ;
168
- padding : 0 3px ;
169
- border-radius : 4px ;
156
+ .jp-git-diff-root .cm-merge-left-editor .cm-merge-l-inserted {
157
+ background-color : var (--jp-merge-local-color1 );
170
158
}
171
159
172
- .jp-git-diff-root .cm-merge-collapsed-line .cm-gutter-elt {
173
- display : none;
160
+ .jp-git-diff-root .cm-merge-r-inserted ,
161
+ .jp-git-diff-root .cm-merge-l-inserted ,
162
+ .jp-git-diff-root .cm-diff-right-editor .cm-merge-r-chunk ,
163
+ .jp-git-diff-root .cm-merge-right-editor .cm-merge-r-chunk {
164
+ background-color : var (--jp-git-diff-added-color );
174
165
}
175
166
176
167
.jp-git-diff-root .cm-merge-spacer {
@@ -182,3 +173,15 @@ button.jp-git-diff-resolve .jp-ToolbarButtonComponent-label {
182
173
var (--jp-border-color0 ) 12px
183
174
);
184
175
}
176
+
177
+ /* Hide drag handles */
178
+ .jp-git-diff-root .jp-Notebook-merge .jp-DragPanel-dragHandle {
179
+ display : none;
180
+ }
181
+
182
+ .jp-git-diff-parent-widget .jp-Merge-notebook-controls {
183
+ margin-bottom : 0 ;
184
+ padding : 0 ;
185
+ background-color : transparent;
186
+ border : none;
187
+ }
0 commit comments