gitweb: Show combined diff for merge commits in 'commitdiff' view

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 974b47f19ca61bd5d12ec88229957c3434d23265..e795b70b2b601aa1f823750d073fdaf80f7ee4d7 100644 (file)
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -107,7 +107,7 @@ span.age {
        font-style: italic;
 }
 
-div.page_body span.signoff {
+span.signoff {
        color: #888888;
 }
 
@@ -181,6 +181,23 @@ table.diff_tree {
        font-family: monospace;
 }
 
+table.combined.diff_tree td {
+       padding-right: 24px;
+}
+
+table.combined.diff_tree td.link {
+       padding: 0px 2px;
+}
+
+table.combined.diff_tree td.nochange a {
+       color: #6666ff;
+}
+
+table.combined.diff_tree td.nochange a:hover,
+table.combined.diff_tree td.nochange a:visited {
+       color: #d06666;
+}
+
 table.blame {
        border-collapse: collapse;
 }
@@ -334,11 +351,13 @@ div.diff.extended_header {
        padding: 2px 0px 2px 0px;
 }
 
+div.diff a.list,
 div.diff a.path,
 div.diff a.hash {
        text-decoration: none;
 }
 
+div.diff a.list:hover,
 div.diff a.path:hover,
 div.diff a.hash:hover {
        text-decoration: underline;
@@ -362,18 +381,33 @@ div.diff.rem {
        color: #cc0000;
 }
 
+div.diff.chunk_header a,
 div.diff.chunk_header {
        color: #990099;
+}
 
+div.diff.chunk_header {
        border: dotted #ffe0ff;
        border-width: 1px 0px 0px 0px;
        margin-top: 2px;
 }
 
+div.diff.chunk_header span.chunk_info {
+       background-color: #ffeeff;
+}
+
+div.diff.chunk_header span.section {
+       color: #aa22aa;
+}
+
 div.diff.incomplete {
        color: #cccccc;
 }
 
+div.diff.nodifferences {
+       font-weight: bold;
+       color: #600000;
+}
 
 div.index_include {
        border: solid #d9d8d1;