Merge branch 'maint'

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 0eda98237e1ea56936b8cd48a6c095090eced7fd..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;
@@ -16,6 +15,13 @@ a:hover, a:visited, a:active {
        color: #880000;
 }
 
+span.cntrl {
+       border: dashed #aaaaaa;
+       border-width: 1px;
+       padding: 0px 2px 0px 2px;
+       margin:  0px 2px 0px 2px;
+}
+
 img.logo {
        float: right;
        border-width: 0px;
@@ -24,7 +30,7 @@ img.logo {
 div.page_header {
        height: 25px;
        padding: 8px;
-       font-size: 18px;
+       font-size: 150%;
        font-weight: bold;
        background-color: #d9d8d1;
 }
@@ -100,13 +106,13 @@ span.age {
        font-style: italic;
 }
 
-div.page_body span.signoff {
+span.signoff {
        color: #888888;
 }
 
 div.log_link {
        padding: 0px 8px;
-       font-size: 10px;
+       font-size: 70%;
        font-family: sans-serif;
        font-style: normal;
        position: relative;
@@ -174,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;
 }
 
@@ -208,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 {
@@ -291,39 +314,98 @@ td.mode {
        font-family: monospace;
 }
 
-div.diff a.list {
+/* styling of diffs (patchsets): commitdiff and blobdiff views */
+div.diff.header,
+div.diff.extended_header {
+       white-space: normal;
+}
+
+div.diff.header {
+       font-weight: bold;
+
+       background-color: #edece6;
+
+       margin-top: 4px;
+       padding: 4px 0px 2px 0px;
+       border: solid #d9d8d1;
+       border-width: 1px 0px 1px 0px;
+}
+
+div.diff.header a.path {
+       text-decoration: underline;
+}
+
+div.diff.extended_header,
+div.diff.extended_header a.path,
+div.diff.extended_header a.hash {
+       color: #777777;
+}
+
+div.diff.extended_header .info {
+       color: #b0b0b0;
+}
+
+div.diff.extended_header {
+       background-color: #f6f5ee;
+       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.list:hover,
+div.diff a.path:hover,
+div.diff a.hash:hover {
        text-decoration: underline;
 }
 
-div.diff.to_file a.list,
-div.diff.to_file,
+div.diff.to_file a.path,
+div.diff.to_file {
+       color: #007000;
+}
+
 div.diff.add {
        color: #008800;
 }
 
-div.diff.from_file a.list,
-div.diff.from_file,
+div.diff.from_file a.path,
+div.diff.from_file {
+       color: #aa0000;
+}
+
 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_info {
-       font-family: monospace;
-       color: #000099;
-       background-color: #edece6;
-       font-style: italic;
+div.diff.nodifferences {
+       font-weight: bold;
+       color: #600000;
 }
 
 div.index_include {
@@ -333,7 +415,7 @@ div.index_include {
 }
 
 div.search {
-       font-size: 12px;
+       font-size: 100%;
        font-weight: normal;
        margin: 4px 8px;
        position: absolute;
@@ -361,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;
 }
@@ -372,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;