You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
112 lines
3.1 KiB
112 lines
3.1 KiB
|
|
.CodeMirror-merge {
|
|
position: relative;
|
|
white-space: pre;
|
|
}
|
|
|
|
.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
|
|
min-height:50px;
|
|
}
|
|
|
|
.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 48%; }
|
|
.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 4%; }
|
|
.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
|
|
.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
|
|
|
|
.CodeMirror-merge-pane {
|
|
display: inline-block;
|
|
white-space: normal;
|
|
vertical-align: top;
|
|
}
|
|
.CodeMirror-merge-pane-rightmost {
|
|
position: absolute;
|
|
right: 0px;
|
|
z-index: 1;
|
|
}
|
|
|
|
.CodeMirror-merge-gap {
|
|
z-index: 2;
|
|
display: inline-block;
|
|
height: 100%;
|
|
-moz-box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
overflow: hidden;
|
|
position: relative;
|
|
background: #515151;
|
|
}
|
|
|
|
.CodeMirror-merge-scrolllock-wrap {
|
|
position: absolute;
|
|
bottom: 0; left: 50%;
|
|
}
|
|
.CodeMirror-merge-scrolllock {
|
|
position: relative;
|
|
left: -50%;
|
|
cursor: pointer;
|
|
color: #d8d8d8;
|
|
line-height: 1;
|
|
}
|
|
|
|
.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
|
|
position: absolute;
|
|
left: 0; top: 0;
|
|
right: 0; bottom: 0;
|
|
line-height: 1;
|
|
}
|
|
|
|
.CodeMirror-merge-copy {
|
|
position: absolute;
|
|
cursor: pointer;
|
|
color: #ce374b;
|
|
z-index: 3;
|
|
}
|
|
|
|
.CodeMirror-merge-copy-reverse {
|
|
position: absolute;
|
|
cursor: pointer;
|
|
color: #44c;
|
|
}
|
|
|
|
.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
|
|
.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
|
|
|
|
.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
|
|
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
|
|
background-position: bottom left;
|
|
background-repeat: repeat-x;
|
|
}
|
|
|
|
.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
|
|
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
|
|
background-position: bottom left;
|
|
background-repeat: repeat-x;
|
|
}
|
|
|
|
.CodeMirror-merge-r-chunk { background: #9a6868; }
|
|
.CodeMirror-merge-r-chunk-start { /*border-top: 1px solid #ee8; */}
|
|
.CodeMirror-merge-r-chunk-end {/* border-bottom: 1px solid #ee8; */}
|
|
.CodeMirror-merge-r-connect { fill:#9a6868;}
|
|
|
|
.CodeMirror-merge-l-chunk { background: #eef; }
|
|
.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
|
|
.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
|
|
.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
|
|
|
|
.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
|
|
.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
|
|
.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
|
|
|
|
.CodeMirror-merge-collapsed-widget:before {
|
|
content: "(...)";
|
|
}
|
|
.CodeMirror-merge-collapsed-widget {
|
|
cursor: pointer;
|
|
color: #88b;
|
|
background: #eef;
|
|
border: 1px solid #ddf;
|
|
font-size: 90%;
|
|
padding: 0 3px;
|
|
border-radius: 4px;
|
|
}
|
|
.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }
|