Merge branch 'maint'

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 2b023bd98a2def18f8a91c95b14fb5aadcbf9a0c..b57c8beccb50a94f910cd3bf48ae1c57cf6c1bb8 100644 (file)
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -1,6 +1,5 @@
 body {
        font-family: sans-serif;
-       font-size: 12px;
        border: solid #d9d8d1;
        border-width: 1px;
        margin: 10px;
@@ -31,7 +30,7 @@ img.logo {
 div.page_header {
        height: 25px;
        padding: 8px;
-       font-size: 18px;
+       font-size: 150%;
        font-weight: bold;
        background-color: #d9d8d1;
 }
@@ -113,7 +112,7 @@ span.signoff {
 
 div.log_link {
        padding: 0px 8px;
-       font-size: 10px;
+       font-size: 70%;
        font-family: sans-serif;
        font-style: normal;
        position: relative;
@@ -181,19 +180,36 @@ 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;
 }
 
 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;
 }
 
@@ -215,14 +231,14 @@ tr.dark:hover {
 
 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 {
@@ -399,7 +415,7 @@ div.index_include {
 }
 
 div.search {
-       font-size: 12px;
+       font-size: 100%;
        font-weight: normal;
        margin: 4px 8px;
        position: absolute;
@@ -427,7 +443,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;
 }
@@ -438,7 +454,7 @@ a.rss_logo:hover {
 
 span.refs span {
        padding: 0px 4px;
-       font-size: 10px;
+       font-size: 70%;
        font-weight: normal;
        border: 1px solid;
        background-color: #ffaaff;