Merge branch 'jh/graph'

* jh/graph:
  ui-log: Move 'Age' column when commit graph is present
  ui-log: Line-wrap long commit subjects when showmsg is enabled
  ui-log: Colorize commit graph
  ui-log: Implement support for commit graphs
  ui-log: Change display of full commit messages (and notes)

Conflicts:
	cgit.css

1 files changed, 29 insertions, 11 deletions

diff --git a/cgit.css b/cgit.css
index a2a685b..008cff8 100644
--- a/cgit.css
+++ b/cgit.css
@@ -153,26 +153,44 @@ table.list td {
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
-table.list td.logsubject {
+table.list td.commitgraph {
         font-family: monospace;
-        font-weight: bold;
+        white-space: pre;
 }
 
-table.list td.logmsg {
-        font-family: monospace;
-        white-space: pre;
-        padding: 1em 0.5em 2em 0.5em;
+table.list td.commitgraph .column1 {
+        color: #a00;
+}
+
+table.list td.commitgraph .column2 {
+        color: #0a0;
+}
+
+table.list td.commitgraph .column3 {
+        color: #aa0;
 }
 
-table.list td.lognotes-label {
-        text-align:right;
-        vertical-align:top;
+table.list td.commitgraph .column4 {
+        color: #00a;
 }
 
-table.list td.lognotes {
+table.list td.commitgraph .column5 {
+        color: #a0a;
+}
+
+table.list td.commitgraph .column6 {
+        color: #0aa;
+}
+
+table.list td.logsubject {
+        font-family: monospace;
+        font-weight: bold;
+}
+
+table.list td.logmsg {
         font-family: monospace;
         white-space: pre;
-        padding: 0em 0.5em 2em 0.5em;
+        padding: 0 0.5em;
 }
 
 table.list td a {