Mercurial

comparison .cms/lib/codemirror/addon/merge/merge.css @ 0:78edf6b517a0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
24.10
author Coffee CMS <info@coffee-cms.ru>
date Fri, 11 Oct 2024 22:40:23 +0000
parents
children
comparison
equal deleted inserted replaced
-1:000000000000 0:78edf6b517a0
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 .CodeMirror-merge-scrolllock:after {
52 content: "\21db\00a0\00a0\21da";
53 }
54 .CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after {
55 content: "\21db\21da";
56 }
57
58 .CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
59 position: absolute;
60 left: 0; top: 0;
61 right: 0; bottom: 0;
62 line-height: 1;
63 }
64
65 .CodeMirror-merge-copy {
66 position: absolute;
67 cursor: pointer;
68 color: #44c;
69 z-index: 3;
70 }
71
72 .CodeMirror-merge-copy-reverse {
73 position: absolute;
74 cursor: pointer;
75 color: #44c;
76 }
77
78 .CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
79 .CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
80
81 .CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
82 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
83 background-position: bottom left;
84 background-repeat: repeat-x;
85 }
86
87 .CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
88 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
89 background-position: bottom left;
90 background-repeat: repeat-x;
91 }
92
93 .CodeMirror-merge-r-chunk { background: #ffffe0; }
94 .CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
95 .CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
96 .CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
97
98 .CodeMirror-merge-l-chunk { background: #eef; }
99 .CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
100 .CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
101 .CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
102
103 .CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
104 .CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
105 .CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
106
107 .CodeMirror-merge-collapsed-widget:before {
108 content: "(...)";
109 }
110 .CodeMirror-merge-collapsed-widget {
111 cursor: pointer;
112 color: #88b;
113 background: #eef;
114 border: 1px solid #ddf;
115 font-size: 90%;
116 padding: 0 3px;
117 border-radius: 4px;
118 }
119 .CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }