forked from mhagger/git-imerge
-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathimerge.css
More file actions
47 lines (38 loc) · 800 Bytes
/
imerge.css
File metadata and controls
47 lines (38 loc) · 800 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
table#imerge {
border-collapse: collapse;
font-family: monospace;
border: 1px solid black;
}
table#imerge td {
padding: 15px 5px;
background: #f44;
border: 1px dashed #444;
text-align: center;
}
table#imerge td.frontier_within {
background: #4f4;
}
table#imerge td.frontier_right_edge {
border-right: 5px solid black;
}
table#imerge td.frontier_bottom_edge {
border-bottom: 5px solid black;
}
table#imerge td.merge_manual {
background: #4f4;
font-weight: bold;
}
table#imerge td.merge_unknown:before {
content: "?"
}
table#imerge td.merge_unknown {
color: #555;
}
table#imerge td.merge_blocked:before {
content: "BLOCKER"
}
table#imerge td.merge_blocked {
background: #c00;
border: 1px solid #400;
font-weight: bold;
}