Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 47c1ade87edbe4727c088435385dd66ecfe13fec..974b47f19ca61bd5d12ec88229957c3434d23265 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;
@@ -42,6 +54,7 @@ div.page_nav a:visited {
 
 div.page_path {
        padding: 8px;
+       font-weight: bold;
        border: solid #d9d8d1;
        border-width: 0px 0px 1px;
 }
@@ -115,11 +128,26 @@ div.list_head {
        font-style: italic;
 }
 
+div.author_date {
+       padding: 8px;
+       border: solid #d9d8d1;
+       border-width: 0px 0px 1px 0px;
+       font-style: italic;
+}
+
 a.list {
        text-decoration: none;
        color: #000000;
 }
 
+a.subject, a.name {
+       font-weight: bold;
+}
+
+table.tags a.subject {
+       font-weight: normal;
+}
+
 a.list:hover {
        text-decoration: underline;
        color: #880000;
@@ -157,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;
@@ -221,6 +255,10 @@ table.diff_tree span.file_status.mode_chnge {
        color: #777777;
 }
 
+table.diff_tree span.file_status.copied {
+  color: #70a070;
+}
+
 /* age2: 60*60*24*2 <= age */
 table.project_list td.age2, table.blame td.age2 {
        font-style: italic;
@@ -260,25 +298,83 @@ td.mode {
        font-family: monospace;
 }
 
+/* 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.path,
+div.diff a.hash {
+       text-decoration: none;
+}
+
+div.diff a.path:hover,
+div.diff a.hash:hover {
+       text-decoration: underline;
+}
+
+div.diff.to_file a.path,
+div.diff.to_file {
+       color: #007000;
+}
+
 div.diff.add {
        color: #008800;
 }
 
+div.diff.from_file a.path,
+div.diff.from_file {
+       color: #aa0000;
+}
+
 div.diff.rem {
        color: #cc0000;
 }
 
 div.diff.chunk_header {
        color: #990099;
+
+       border: dotted #ffe0ff;
+       border-width: 1px 0px 0px 0px;
+       margin-top: 2px;
 }
 
-div.diff_info {
-       font-family: monospace;
-       color: #000099;
-       background-color: #edece6;
-       font-style: italic;
+div.diff.incomplete {
+       color: #cccccc;
 }
 
+
 div.index_include {
        border: solid #d9d8d1;
        border-width: 0px 0px 1px;
@@ -286,6 +382,8 @@ div.index_include {
 }
 
 div.search {
+       font-size: 12px;
+       font-weight: normal;
        margin: 4px 8px;
        position: absolute;
        top: 56px;
@@ -321,15 +419,30 @@ a.rss_logo:hover {
        background-color: #ee5500;
 }
 
-span.tag {
+span.refs span {
        padding: 0px 4px;
        font-size: 10px;
        font-weight: normal;
-       background-color: #ffffaa;
        border: 1px solid;
+       background-color: #ffaaff;
+       border-color: #ffccff #ff00ee #ff00ee #ffccff;
+}
+
+span.refs span.ref {
+       background-color: #aaaaff;
+       border-color: #ccccff #0033cc #0033cc #ccccff;
+}
+
+span.refs span.tag {
+       background-color: #ffffaa;
        border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
 }
 
+span.refs span.head {
+       background-color: #aaffaa;
+       border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
+}
+
 span.atnight {
        color: #cc0000;
 }