mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-09-20 20:17:28 +03:00
ccfee0eae6
When given --html=foo.html, a HTML file containing a table of the current merge frontier is written to foo.html. The table contains the classes needed to allow the accompanying imerge.css to render it in colorful glory.
48 lines
800 B
CSS
48 lines
800 B
CSS
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;
|
|
}
|