Merge branch 'ld/git-p4-tags-and-labels'

diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css
index 21842a66ac33d8f42e3348006a99ef45acdce24e..cb86d2d029637ec64f70cc9e1cdbeeea972e8771 100644 (file)
--- a/gitweb/static/gitweb.css
+++ b/gitweb/static/gitweb.css
@@ -438,6 +438,10 @@ div.diff.add {
        color: #008800;
 }
 
+div.diff.add span.marked {
+       background-color: #aaffaa;
+}
+
 div.diff.from_file a.path,
 div.diff.from_file {
        color: #aa0000;
@@ -447,6 +451,10 @@ div.diff.rem {
        color: #cc0000;
 }
 
+div.diff.rem span.marked {
+       background-color: #ffaaaa;
+}
+
 div.diff.chunk_header a,
 div.diff.chunk_header {
        color: #990099;
@@ -491,6 +499,19 @@ div.chunk_block div.new {
        width: 50%;
 }
 
+div.chunk_block.rem div.old div.diff.rem {
+       background-color: #fff5f5;
+}
+div.chunk_block.add div.new div.diff.add {
+       background-color: #f8fff8;
+}
+div.chunk_block.chg div     div.diff {
+       background-color: #fffff0;
+}
+div.chunk_block.ctx div     div.diff.ctx {
+       color: #404040;
+}
+
 
 div.index_include {
        border: solid #d9d8d1;
@@ -507,8 +528,13 @@ div.search {
        right: 12px
 }
 
-p.projsearch {
+div.projsearch {
        text-align: center;
+       margin: 20px 0px;
+}
+
+div.projsearch form {
+       margin-bottom: 2px;
 }
 
 td.linenr {