merge-tree: use ll_merge() not xdl_merge()

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 5e402924040d55aff5fb831a737d108d1e68a0bb..50067f2e0dea2c1e17a41e9a5e8b2a8f6240c13d 100644 (file)
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -1,6 +1,6 @@
 body {
        font-family: sans-serif;
-       font-size: 12px;
+       font-size: small;
        border: solid #d9d8d1;
        border-width: 1px;
        margin: 10px;
@@ -28,10 +28,18 @@ img.logo {
        border-width: 0px;
 }
 
+img.avatar {
+       vertical-align: middle;
+}
+
+a.list img.avatar {
+       border-style: none;
+}
+
 div.page_header {
        height: 25px;
        padding: 8px;
-       font-size: 18px;
+       font-size: 150%;
        font-weight: bold;
        background-color: #d9d8d1;
 }
@@ -71,6 +79,13 @@ div.page_footer_text {
        font-style: italic;
 }
 
+div#generating_info {
+       margin: 4px;
+       font-size: smaller;
+       text-align: center;
+       color: #505050;
+}
+
 div.page_body {
        padding: 8px;
        font-family: monospace;
@@ -85,6 +100,10 @@ div.title, a.title {
        color: #000000;
 }
 
+div.readme {
+       padding: 8px;
+}
+
 a.title:hover {
        background-color: #d9d8d1;
 }
@@ -113,7 +132,7 @@ span.signoff {
 
 div.log_link {
        padding: 0px 8px;
-       font-size: 10px;
+       font-size: 70%;
        font-family: sans-serif;
        font-style: normal;
        position: relative;
@@ -128,11 +147,14 @@ div.list_head {
        font-style: italic;
 }
 
+.author_date, .author {
+       font-style: italic;
+}
+
 div.author_date {
        padding: 8px;
        border: solid #d9d8d1;
        border-width: 0px 0px 1px 0px;
-       font-style: italic;
 }
 
 a.list {
@@ -170,59 +192,90 @@ a.text:hover {
 
 table {
        padding: 8px 4px;
-}
-
-table.project_list {
        border-spacing: 0;
 }
 
 table.diff_tree {
-       border-spacing: 0;
        font-family: monospace;
 }
 
+table.combined.diff_tree th {
+       text-align: center;
+}
+
+table.combined.diff_tree td {
+       padding-right: 24px;
+}
+
+table.combined.diff_tree th.link,
+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;
 }
 
 table.blame td {
        padding: 0px 5px;
-       font-size: 12px;
+       font-size: 100%;
        vertical-align: top;
 }
 
 th {
        padding: 2px 5px;
-       font-size: 12px;
+       font-size: 100%;
        text-align: left;
 }
 
-tr.light:hover {
-       background-color: #edece6;
-}
-
-tr.dark {
-       background-color: #f6f6f0;
+/* do not change row style on hover for 'blame' view */
+tr.light,
+table.blame .light:hover {
+       background-color: #ffffff;
 }
 
-tr.dark2 {
+tr.dark,
+table.blame .dark:hover {
        background-color: #f6f6f0;
 }
 
+/* currently both use the same, but it can change */
+tr.light:hover,
 tr.dark:hover {
        background-color: #edece6;
 }
 
+/* boundary commits in 'blame' view */
+/* and commits without "previous" */
+tr.boundary td.sha1,
+tr.no-previous td.linenr {
+       font-weight: bold;
+}
+
+/* for 'blame_incremental', during processing */
+tr.color1 { background-color: #f6fff6; }
+tr.color2 { background-color: #f6f6ff; }
+tr.color3 { background-color: #fff6f6; }
+
 td {
        padding: 2px 5px;
-       font-size: 12px;
+       font-size: 100%;
        vertical-align: top;
 }
 
 td.link, td.selflink {
        padding: 2px 5px;
        font-family: sans-serif;
-       font-size: 10px;
+       font-size: 70%;
 }
 
 td.selflink {
@@ -233,7 +286,7 @@ td.sha1 {
        font-family: monospace;
 }
 
-td.error {
+.error {
        color: red;
        background-color: yellow;
 }
@@ -259,6 +312,12 @@ table.diff_tree span.file_status.copied {
   color: #70a070;
 }
 
+/* noage: "No commits" */
+table.project_list td.noage {
+       color: #808080;
+       font-style: italic;
+}
+
 /* age2: 60*60*24*2 <= age */
 table.project_list td.age2, table.blame td.age2 {
        font-style: italic;
@@ -298,6 +357,23 @@ td.mode {
        font-family: monospace;
 }
 
+/* progress of blame_interactive */
+div#progress_bar {
+       height: 2px;
+       margin-bottom: -2px;
+       background-color: #d8d9d0;
+}
+div#progress_info {
+       float: right;
+       text-align: right;
+}
+
+/* format of (optional) objects size in 'tree' view */
+td.size {
+       font-family: monospace;
+       text-align: right;
+}
+
 /* styling of diffs (patchsets): commitdiff and blobdiff views */
 div.diff.header,
 div.diff.extended_header {
@@ -387,6 +463,10 @@ div.diff.incomplete {
        color: #cccccc;
 }
 
+div.diff.nodifferences {
+       font-weight: bold;
+       color: #600000;
+}
 
 div.index_include {
        border: solid #d9d8d1;
@@ -395,14 +475,18 @@ div.index_include {
 }
 
 div.search {
-       font-size: 12px;
+       font-size: 100%;
        font-weight: normal;
        margin: 4px 8px;
-       position: absolute;
+       float: right;
        top: 56px;
        right: 12px
 }
 
+p.projsearch {
+       text-align: center;
+}
+
 td.linenr {
        text-align: right;
 }
@@ -423,7 +507,7 @@ a.rss_logo {
        background-color: #ff6600;
        font-weight: bold;
        font-family: sans-serif;
-       font-size: 10px;
+       font-size: 70%;
        text-align: center;
        text-decoration: none;
 }
@@ -432,15 +516,36 @@ a.rss_logo:hover {
        background-color: #ee5500;
 }
 
+a.rss_logo.generic {
+       background-color: #ff8800;
+}
+
+a.rss_logo.generic:hover {
+       background-color: #ee7700;
+}
+
 span.refs span {
        padding: 0px 4px;
-       font-size: 10px;
+       font-size: 70%;
        font-weight: normal;
        border: 1px solid;
        background-color: #ffaaff;
        border-color: #ffccff #ff00ee #ff00ee #ffccff;
 }
 
+span.refs span a {
+       text-decoration: none;
+       color: inherit;
+}
+
+span.refs span a:hover {
+       text-decoration: underline;
+}
+
+span.refs span.indirect {
+       font-style: italic;
+}
+
 span.refs span.ref {
        background-color: #aaaaff;
        border-color: #ccccff #0033cc #0033cc #ccccff;
@@ -463,3 +568,7 @@ span.atnight {
 span.match {
        color: #e00000;
 }
+
+div.binary {
+       font-style: italic;
+}