Merge branch 'maint'

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index eb9fc3804b1445207a9afff688d9c8ba954255df..7177c6e86b8e8c3dc1e5d0db4bce4122cbe2430a 100644 (file)
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -16,6 +16,18 @@ 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;
+}
+
 div.page_header {
        height: 25px;
        padding: 8px;
@@ -173,6 +185,12 @@ table.blame {
        border-collapse: collapse;
 }
 
+table.blame td {
+       padding: 0px 5px;
+       font-size: 12px;
+       vertical-align: top;
+}
+
 th {
        padding: 2px 5px;
        font-size: 12px;
@@ -280,40 +298,95 @@ 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.index_include {
        border: solid #d9d8d1;
@@ -322,6 +395,8 @@ div.index_include {
 }
 
 div.search {
+       font-size: 12px;
+       font-weight: normal;
        margin: 4px 8px;
        position: absolute;
        top: 56px;