| 5 |
lars |
1 |
.CodeMirror-merge {
|
|
|
2 |
position: relative;
|
|
|
3 |
border: 1px solid #ddd;
|
|
|
4 |
white-space: pre;
|
|
|
5 |
}
|
|
|
6 |
|
|
|
7 |
.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
|
|
|
8 |
height: 350px;
|
|
|
9 |
}
|
|
|
10 |
|
|
|
11 |
.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 47%; }
|
|
|
12 |
.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 6%; }
|
|
|
13 |
.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
|
|
|
14 |
.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
|
|
|
15 |
|
|
|
16 |
.CodeMirror-merge-pane {
|
|
|
17 |
display: inline-block;
|
|
|
18 |
white-space: normal;
|
|
|
19 |
vertical-align: top;
|
|
|
20 |
}
|
|
|
21 |
.CodeMirror-merge-pane-rightmost {
|
|
|
22 |
position: absolute;
|
|
|
23 |
right: 0px;
|
|
|
24 |
z-index: 1;
|
|
|
25 |
}
|
|
|
26 |
|
|
|
27 |
.CodeMirror-merge-gap {
|
|
|
28 |
z-index: 2;
|
|
|
29 |
display: inline-block;
|
|
|
30 |
height: 100%;
|
|
|
31 |
-moz-box-sizing: border-box;
|
|
|
32 |
box-sizing: border-box;
|
|
|
33 |
overflow: hidden;
|
|
|
34 |
border-left: 1px solid #ddd;
|
|
|
35 |
border-right: 1px solid #ddd;
|
|
|
36 |
position: relative;
|
|
|
37 |
background: #f8f8f8;
|
|
|
38 |
}
|
|
|
39 |
|
|
|
40 |
.CodeMirror-merge-scrolllock-wrap {
|
|
|
41 |
position: absolute;
|
|
|
42 |
bottom: 0; left: 50%;
|
|
|
43 |
}
|
|
|
44 |
.CodeMirror-merge-scrolllock {
|
|
|
45 |
position: relative;
|
|
|
46 |
left: -50%;
|
|
|
47 |
cursor: pointer;
|
|
|
48 |
color: #555;
|
|
|
49 |
line-height: 1;
|
|
|
50 |
}
|
|
|
51 |
|
|
|
52 |
.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
|
|
|
53 |
position: absolute;
|
|
|
54 |
left: 0; top: 0;
|
|
|
55 |
right: 0; bottom: 0;
|
|
|
56 |
line-height: 1;
|
|
|
57 |
}
|
|
|
58 |
|
|
|
59 |
.CodeMirror-merge-copy {
|
|
|
60 |
position: absolute;
|
|
|
61 |
cursor: pointer;
|
|
|
62 |
color: #44c;
|
|
|
63 |
}
|
|
|
64 |
|
|
|
65 |
.CodeMirror-merge-copy-reverse {
|
|
|
66 |
position: absolute;
|
|
|
67 |
cursor: pointer;
|
|
|
68 |
color: #44c;
|
|
|
69 |
}
|
|
|
70 |
|
|
|
71 |
.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
|
|
|
72 |
.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
|
|
|
73 |
|
|
|
74 |
.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
|
|
|
75 |
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
|
|
|
76 |
background-position: bottom left;
|
|
|
77 |
background-repeat: repeat-x;
|
|
|
78 |
}
|
|
|
79 |
|
|
|
80 |
.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
|
|
|
81 |
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
|
|
|
82 |
background-position: bottom left;
|
|
|
83 |
background-repeat: repeat-x;
|
|
|
84 |
}
|
|
|
85 |
|
|
|
86 |
.CodeMirror-merge-r-chunk { background: #ffffe0; }
|
|
|
87 |
.CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
|
|
|
88 |
.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
|
|
|
89 |
.CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
|
|
|
90 |
|
|
|
91 |
.CodeMirror-merge-l-chunk { background: #eef; }
|
|
|
92 |
.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
|
|
|
93 |
.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
|
|
|
94 |
.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
|
|
|
95 |
|
|
|
96 |
.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
|
|
|
97 |
.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
|
|
|
98 |
.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
|
|
|
99 |
|
|
|
100 |
.CodeMirror-merge-collapsed-widget:before {
|
|
|
101 |
content: "(...)";
|
|
|
102 |
}
|
|
|
103 |
.CodeMirror-merge-collapsed-widget {
|
|
|
104 |
cursor: pointer;
|
|
|
105 |
color: #88b;
|
|
|
106 |
background: #eef;
|
|
|
107 |
border: 1px solid #ddf;
|
|
|
108 |
font-size: 90%;
|
|
|
109 |
padding: 0 3px;
|
|
|
110 |
border-radius: 4px;
|
|
|
111 |
}
|
|
|
112 |
.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }
|