src/styles/merge.css

4 .jp-Notebook-merge .jp-Metadata-diff {
8 .jp-Notebook-merge .jp-Metadata-diff .jp-CollapsiblePanel {
12 .jp-Notebook-merge .jp-Cell-merge {
17 .jp-Notebook-merge .jp-Merge-unchanged {
22 .jp-Notebook-merge .jp-merge-celldragdrop > .p-Panel:not(:first-child) {
26 .jp-Notebook-merge .CodeMirror-merge-pane-local,
27 .jp-Notebook-merge .CodeMirror-merge-pane-remote,
28 …jp-Notebook-merge .CodeMirror-merge-pane-base:not(.CodeMirror-merge-pane-unchanged):not(.CodeMirro…
32 .jp-Notebook-merge .CodeMirror-merge-pane-final {
37 .jp-Notebook-merge .jp-Output-result img {
41 .jp-Notebook-merge .jp-Merge-cellHeader {
47 .jp-Notebook-merge .jp-Merge-cellHeader > .p-Widget {
51 .jp-Notebook-merge .jp-Merge-cellHeader-title {
55 .jp-Notebook-merge .jp-DragPanel-dragHandle {
66 .jp-Cell-merge.p-mod-drag-image {
70 .jp-Cell-merge.p-mod-drag-image .jp-Merge-cellHeader {
84 .jp-Notebook-merge .CodeMirror-merge-pane-deleted,
85 .jp-Notebook-merge .CodeMirror-merge-pane-added {
89 .jp-Notebook-merge .CodeMirror-merge-spacer { background-color: #eee; }
91 .jp-Notebook-merge .CodeMirror-merge-r-chunk { background-color: var(--jp-merge-remote-color2); }
92 .jp-Notebook-merge .CodeMirror-merge-r-chunk-start,
93 .jp-Notebook-merge .CodeMirror-merge-m-chunk-start-remote { border-top: 1px solid var(--jp-merge-re…
94 .jp-Notebook-merge .CodeMirror-merge-r-chunk-end,
95 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-remote { border-bottom: 1px solid var(--jp-merge-r…
96 .jp-Notebook-merge .CodeMirror-merge-r-connect { fill: var(--jp-merge-remote-color2); stroke: var(-…
97 .jp-Notebook-merge .CodeMirror-line .CodeMirror-merge-r-inserted { background-color: var(--jp-merge…
99 .jp-Notebook-merge .CodeMirror-merge-r-chunk-end-empty + .CodeMirror-linewidget .CodeMirror-merge-s…
100 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-remote-empty + .CodeMirror-linewidget .CodeMirror-…
101   border-bottom: 1px solid var(--jp-merge-remote-color1);
102   background-color: var(--jp-merge-remote-color3);
105 .jp-Notebook-merge .CodeMirror-merge-l-chunk { background-color: var(--jp-merge-local-color2); }
106 .jp-Notebook-merge .CodeMirror-merge-l-chunk-start,
107 .jp-Notebook-merge .CodeMirror-merge-m-chunk-start-local { border-top: 1px solid var(--jp-merge-loc…
108 .jp-Notebook-merge .CodeMirror-merge-l-chunk-end,
109 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-local { border-bottom: 1px solid var(--jp-merge-lo…
110 .jp-Notebook-merge .CodeMirror-merge-l-connect { fill: var(--jp-merge-local-color2); stroke: var(--…
111 .jp-Notebook-merge .CodeMirror-line .CodeMirror-merge-l-inserted { background-color: var(--jp-merge…
113 .jp-Notebook-merge .CodeMirror-merge-l-chunk-end-empty + .CodeMirror-linewidget .CodeMirror-merge-s…
114 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-local-empty + .CodeMirror-linewidget .CodeMirror-m…
115   border-bottom: 1px solid var(--jp-merge-local-color1);
116   background-color: var(--jp-merge-local-color3);
119 .jp-Notebook-merge .CodeMirror-merge-m-chunk-custom { background-color: #ffb; }
120 .jp-Notebook-merge .CodeMirror-merge-m-chunk-start-custom { border-top: 1px solid #fe6; }
121 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-custom { border-bottom: 1px solid #fe6; }
125 .jp-Notebook-merge .CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: var(--jp-merge-…
126 .jp-Notebook-merge .CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px…
127 .jp-Notebook-merge .CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px …
129 .jp-Notebook-merge .CodeMirror-merge-l-chunk-end-empty.CodeMirror-merge-r-chunk-end-empty + .CodeMi…
130 …-Notebook-merge .CodeMirror-merge-m-chunk-end-remote-empty.CodeMirror-merge-m-chunk-end-local-empt…
131   border-bottom: 1px solid var(--jp-merge-both-color1);
132   background-color: var(--jp-merge-both-color2);
135 .jp-Notebook-merge .CodeMirror-merge-r-chunk-end-empty,
136 .jp-Notebook-merge .CodeMirror-merge-l-chunk-end-empty,
137 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-empty,
138 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-either-empty,
139 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-remote-empty,
140 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-local-empty,
141 .jp-Notebook-merge .CodeMirror pre.CodeMirror-line {
146 .jp-Notebook-merge .CodeMirror-merge-m-chunk-start-either,
147 .jp-Notebook-merge .CodeMirror-merge-m-chunk-start-mixed:not(.CodeMirror-merge-m-chunk-custom) {
148   border-top: 1px solid var(--jp-merge-either-color1);
150 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-either,
151 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-mixed:not(.CodeMirror-merge-m-chunk-custom) {
152   border-bottom: 1px solid var(--jp-merge-either-color1);
155 .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-either-empty + .CodeMirror-linewidget .CodeMirror-…
156   border-bottom: 1px solid var(--jp-merge-either-color1);
157   background-color: var(--jp-merge-either-color2);
160 .jp-Notebook-merge .CodeMirror-merge-pane-base .CodeMirror-line .CodeMirror-merge-m-deleted,
161 .jp-Notebook-merge .CodeMirror-merge-pane-base .CodeMirror-line .CodeMirror-merge-l-deleted,
162 .jp-Notebook-merge .CodeMirror-merge-pane-base .CodeMirror-line .CodeMirror-merge-r-deleted {
167 .jp-Notebook-merge .CodeMirror-gutter-wrapper {
172 .jp-Notebook-merge .CodeMirror-linenumber {
176 .jp-Notebook-merge .jp-Merge-oneway-local,
177 .jp-Notebook-merge .jp-Merge-oneway-remote {
181 .jp-Notebook-merge .jp-Merge-oneway-remote {
185 .jp-Notebook-merge .jp-Merge-oneway-local .CodeMirror {
186   background-color: var(--jp-merge-local-color2);
189 .jp-Notebook-merge .jp-Merge-oneway-remote .CodeMirror {
190   background-color: var(--jp-merge-remote-color2);
193 .jp-Notebook-merge .jp-Merge-gutter-picker {
198 .jp-Notebook-merge .jp-Merge-gutter-conflict {
204 .jp-Notebook-merge .jp-Merge-conflict {
205   background-color: var(--jp-merge-both-color2);
208 .jp-Notebook-merge .CodeMirror-merge-pane.CodeMirror-merge-pane-local.jp-mod-missing {
209   background-color: var(--jp-merge-local-color2);
212 .jp-Notebook-merge .CodeMirror-merge-pane.CodeMirror-merge-pane-remote.jp-mod-missing {
213   background-color: var(--jp-merge-remote-color2);
216 .jp-Notebook-merge .jp-Cell-merge.jp-mod-todelete > .p-Widget:not(.jp-Merge-cellHeader) {
221 .jp-Notebook-merge .jp-Cell-merge.jp-mod-todelete .jp-Merge-cellHeader {
222   background-color: var(--jp-merge-both-color2);
225 .jp-Cell-merge.jp-mod-clearoutputs .jp-Cellrow-outputs {
229 .jp-Notebook-merge .jp-Cellrow-outputs .jp-OutputArea {
233 .jp-Notebook-merge .jp-Cellrow-outputs .p-FlexPanel:last-of-type .jp-OutputArea {
237 .jp-Notebook-merge .jp-Cellrow-outputs.jp-conflicted-outputs .jp-CollapsiblePanel-header {
238   background-color: var(--jp-merge-both-color2)
241 .jp-Notebook-merge .jp-Cellrow-outputs.jp-conflicted-outputs .jp-CollapsiblePanel-header {
242   background-color: var(--jp-merge-both-color2);
243   border-top: var(--jp-merge-both-color1) solid 1pt;
246 .jp-Notebook-merge .jp-Cellrow-outputs.jp-conflicted-outputs {
247     border: var(--jp-merge-both-color1) solid 1pt;
255 .jp-Notebook-merge .jp-Diff-renderedOutput .jp-Merge-local {
256   background-color: var(--jp-merge-local-color2);
259 .jp-Notebook-merge .jp-Diff-renderedOutput .jp-Merge-remote {
260   background-color: var(--jp-merge-remote-color2);
263 .jp-Notebook-merge .jp-Cellrow-outputs .jp-OutputArea {
271 .jp-Notebook-merge .jp-Merge-oneway-local .jp-Cellrow-outputs,
272 .jp-Notebook-merge .jp-Merge-oneway-remote .jp-Cellrow-outputs {
276 .jp-Notebook-merge .jp-Output:first-child {
292 .jp-Notebook-merge label[disabled] {
301 .jp-Notebook-merge .CodeMirror-gutter-wrapper {
310 .jp-Notebook-merge .jp-conflicted-cells {
314 .jp-Notebook-merge .jp-conflicted-cells .jp-conflicted-cells-header {
323 .jp-Notebook-merge .jp-conflicted-cells .jp-conflicted-cells-button {
327 .jp-Notebook-merge .jp-conflicted-cells > .jp-DragPanel {
337 .jp-Notebook-merge .jp-Diff-outputPanel .jp-Diff-outputMenu {
350 .jp-Notebook-merge .jp-Diff-outputPanel:hover .jp-Diff-outputMenu {
354 .jp-Notebook-merge .jp-Diff-trustOutputButton {
358 .jp-Notebook-merge .jp-Diff-trustCandidate .jp-Diff-trustOutputButton {
362 .jp-Notebook-merge .jp-Diff-outputPanel:not(.jp-Diff-trustCandidate) .jp-diff-base64Output + .jp-Di…
366 .jp-Notebook-merge .jp-Diff-outputPanel .jp-Diff-outputMenu > :not(:first-child) {
376 .jp-Notebook-merge .jp-Diff-renderedOutput {